Merge branch 'master' of http://111.203.232.171:8888/lee/chnmuseum-party into master

src/main/java/cn/wisenergy/chnmuseum/party/model/TInteraction.java

@@ -86,15 +86,16 @@ public class TInteraction implements Serializable {
     @NotNull(message = "创建时间不能为空", groups = {Add.class, Update.class})
     private LocalDateTime createTime;
 
+    @ApiModelProperty("管理员账号")
+    @TableField("user_id")
+    private String userId;
 
     @ApiModelProperty("管理员账号")
     @TableField(exist = false)
-    @NotNull(message = "管理员账号不能为空", groups = {Add.class})
     private String name;
 
     @ApiModelProperty("密码")
     @TableField(exist = false)
-    @NotNull(message = "密码不能为空", groups = {Add.class})
     private String password;
 
 

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/TInteractionController.java

@@ -89,6 +89,11 @@ public class TInteractionController extends BaseController {
                 resultMap.put("message", "用户不是单位管理员");
                 return resultMap;
             }
+            if (user.getOrgId()!=null&&user.getOrgId()!=tInteraction.getOrganId()){
+                resultMap.put("resultCode", "500");
+                resultMap.put("message", "管理员账号不是本机构的单位管理员");
+                return resultMap;
+            }
             byte[] salt = user.getPasswordSalt();
             if (!new String(SHA256PasswordEncryptionService.createPasswordHash(tInteraction.getPassword(), salt))
                     .equals(new String(user.getPasswordHash()))) {
@@ -96,7 +101,7 @@ public class TInteractionController extends BaseController {
                 resultMap.put("message", "密码错误");
                 return resultMap;
             }
-            tInteraction.setUsername(user.getUserName());
+            tInteraction.setUserId(user.getId());
             tInteraction.setCreateTime(LocalDateTime.now());
             result = tInteractionService.save(tInteraction);
             // 返回操作结果

src/main/resources/mapper/TInteractionMapper.xml

@@ -14,6 +14,8 @@
         <result column="content" property="content"/>
         <result column="images" property="images"/>
         <result column="create_time" property="createTime"/>
+        <result column="user_id" property="userId"/>
+        <result column="name" property="name"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -22,9 +24,10 @@
     </sql>
 
     <select id="selectPageList" resultMap="BaseResultMap">
-        SELECT i.*,e.`name` board_name
+        SELECT i.*,e.`name` board_name,u.user_name name
 FROM t_interaction i
 left join exhibition_board e on e.id = i.board_id
+left join t_user u on u.id = i.user_id
         where i.organ_id =#{orgId}
         order by i.create_time desc
     </select>