dingxin 6 年之前
父節點
當前提交
c3159ae031

+ 8
- 0
CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TpTransaction.java 查看文件

@@ -27,6 +27,14 @@ public class TpTransaction {
27 27
 
28 28
     private Date updateDate;
29 29
 
30
+    private  Integer roleId;
31
+
32
+    public Integer getRoleId() {
33
+        return roleId;
34
+    }
35
+    public void setRoleId(Integer roleId) {
36
+        this.roleId = roleId;
37
+    }
30 38
     public Integer getId() {
31 39
         return id;
32 40
     }

+ 1
- 0
CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/FaceServicelimpl.java 查看文件

@@ -129,6 +129,7 @@ public class FaceServicelimpl implements FaceServiceI {
129 129
 
130 130
              /*推送海康*/
131 131
             String data=HKOpenApi.HKpersonGroupId(uploadFile, user.getHkUserId(), user.getId(), user.getUserName(), user.getHkCardNo());
132
+
132 133
               /*boolean isA为true进行添加,为false进行修改*/
133 134
             if (0 == type && 1 == faceNum) {
134 135
                 if (null == data) {

+ 15
- 2
CODE/smart-community/app-api/src/main/resources/mapper/TpTransactionMapper.xml 查看文件

@@ -14,6 +14,7 @@
14 14
     <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
15 15
     <result column="update_user" property="updateUser" jdbcType="INTEGER" />
16 16
     <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
17
+    <result column="role_id" property="roleId" jdbcType="INTEGER" />
17 18
   </resultMap>
18 19
   <sql id="Base_Column_List" >
19 20
     id, community_id, ta_user_id, transaction_title, transaction_content,
@@ -21,9 +22,21 @@
21 22
   </sql>
22 23
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
23 24
     select 
24
-    <include refid="Base_Column_List" />
25
+     id,
26
+     community_id,
27
+     ta_user_id,
28
+     transaction_title,
29
+     transaction_content,
30
+     view_count,
31
+     status,
32
+     type,
33
+     create_user,
34
+     create_date,
35
+     update_user,
36
+     update_date,
37
+    (SELECT role_id FROM ta_sys_user_role WHERE user_id=ta_user_id) AS role_id
25 38
     from tp_transaction
26
-    where id = #{id,jdbcType=INTEGER} and #{communityId,jdbcType=INTEGER}
39
+    where id = #{id,jdbcType=INTEGER} and community_id=#{communityId,jdbcType=INTEGER}
27 40
   </select>
28 41
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
29 42
     delete from tp_transaction