Commit 45f3fe25 authored by wzp's avatar wzp

修改bug

parent 3859c910
...@@ -86,15 +86,16 @@ public class TInteraction implements Serializable { ...@@ -86,15 +86,16 @@ public class TInteraction implements Serializable {
@NotNull(message = "创建时间不能为空", groups = {Add.class, Update.class}) @NotNull(message = "创建时间不能为空", groups = {Add.class, Update.class})
private LocalDateTime createTime; private LocalDateTime createTime;
@ApiModelProperty("管理员账号")
@TableField("user_id")
private String userId;
@ApiModelProperty("管理员账号") @ApiModelProperty("管理员账号")
@TableField(exist = false) @TableField(exist = false)
@NotNull(message = "管理员账号不能为空", groups = {Add.class})
private String name; private String name;
@ApiModelProperty("密码") @ApiModelProperty("密码")
@TableField(exist = false) @TableField(exist = false)
@NotNull(message = "密码不能为空", groups = {Add.class})
private String password; private String password;
......
...@@ -89,6 +89,11 @@ public class TInteractionController extends BaseController { ...@@ -89,6 +89,11 @@ public class TInteractionController extends BaseController {
resultMap.put("message", "用户不是单位管理员"); resultMap.put("message", "用户不是单位管理员");
return resultMap; return resultMap;
} }
if (user.getOrgId()!=null&&user.getOrgId()!=tInteraction.getOrganId()){
resultMap.put("resultCode", "500");
resultMap.put("message", "管理员账号不是本机构的单位管理员");
return resultMap;
}
byte[] salt = user.getPasswordSalt(); byte[] salt = user.getPasswordSalt();
if (!new String(SHA256PasswordEncryptionService.createPasswordHash(tInteraction.getPassword(), salt)) if (!new String(SHA256PasswordEncryptionService.createPasswordHash(tInteraction.getPassword(), salt))
.equals(new String(user.getPasswordHash()))) { .equals(new String(user.getPasswordHash()))) {
...@@ -96,7 +101,7 @@ public class TInteractionController extends BaseController { ...@@ -96,7 +101,7 @@ public class TInteractionController extends BaseController {
resultMap.put("message", "密码错误"); resultMap.put("message", "密码错误");
return resultMap; return resultMap;
} }
tInteraction.setUsername(user.getUserName()); tInteraction.setUserId(user.getId());
tInteraction.setCreateTime(LocalDateTime.now()); tInteraction.setCreateTime(LocalDateTime.now());
result = tInteractionService.save(tInteraction); result = tInteractionService.save(tInteraction);
// 返回操作结果 // 返回操作结果
......
...@@ -14,6 +14,8 @@ ...@@ -14,6 +14,8 @@
<result column="content" property="content"/> <result column="content" property="content"/>
<result column="images" property="images"/> <result column="images" property="images"/>
<result column="create_time" property="createTime"/> <result column="create_time" property="createTime"/>
<result column="user_id" property="userId"/>
<result column="name" property="name"/>
</resultMap> </resultMap>
<!-- 通用查询结果列 --> <!-- 通用查询结果列 -->
...@@ -22,9 +24,10 @@ ...@@ -22,9 +24,10 @@
</sql> </sql>
<select id="selectPageList" resultMap="BaseResultMap"> <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 FROM t_interaction i
left join exhibition_board e on e.id = i.board_id 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} where i.organ_id =#{orgId}
order by i.create_time desc order by i.create_time desc
</select> </select>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment