新需求

src/main/java/com/bonus/aqgqj/basis/controller/HomeController.java

@@ -98,6 +98,7 @@ public class HomeController {
 	@PostMapping(value = "getExpireDataList")
 	@DecryptAndVerify(decryptedClass = SamplesManageDto.class)
 	@LogAnnotation(operModul = "系统管理-首页", operation = "获取临期数据列表", operDesc = "业务级事件",operType="查询")
+	@PreAuthorize("@pms.hasPermission('sys:alter:all')")
 	public ServerResponse getExpireDataList(EncryptedReq<SamplesManageDto> data) {
 		PageHelper.startPage(data.getData().getPage(), data.getData().getLimit());
 		try {

src/main/java/com/bonus/aqgqj/system/controller/UserController.java

@@ -350,6 +350,21 @@ public class UserController {
 		return ServerResponse.createErroe("操作失败");
 	}
 
+	@PostMapping(value = "getPersonList")
+	@DecryptAndVerify(decryptedClass = SysUser.class)
+	@LogAnnotation(operModul = "系统管理-个人信息管理", operation = "查询个人信息列表", operDesc = "系统级事件",operType="查询")
+	public ServerResponse getPersonList(EncryptedReq<SysUser> data) {
+		PageHelper.startPage(data.getData().getPage(), data.getData().getLimit());
+		try {
+			List<SysUser> list = userService.getPersonList(data.getData());
+			PageInfo<SysUser> pageInfo = new PageInfo<>(list);
+			return  ServerResponse.createSuccessPage(pageInfo,data.getData().getPage(),data.getData().getLimit());
+		} catch (Exception e) {
+			log.error(e.toString(),e);
+		}
+		return ServerResponse.createErrorPage(data.getData().getPage(),data.getData().getLimit());
+	}
+
 
 	/**
 	 * 上传用户签字图片

src/main/java/com/bonus/aqgqj/system/dao/UserDao.java

@@ -190,4 +190,11 @@ public interface UserDao {
 	* @return
 	*/
 	int delSignById(Long id);
+
+	/**
+	* 查询人员列表
+	* @param data
+	* @return
+	*/
+	List<SysUser> getPersonList(SysUser data);
 }

src/main/java/com/bonus/aqgqj/system/service/UserService.java

@@ -161,4 +161,11 @@ public interface UserService {
 	 * @return
 	 */
 	int delSignById(Long id);
+
+	/**
+	* 查询个人信息
+	* @param data
+	* @return
+	*/
+	List<SysUser> getPersonList(SysUser data);
 }

src/main/java/com/bonus/aqgqj/system/service/impl/UserServiceImpl.java

@@ -251,6 +251,24 @@ public class UserServiceImpl implements UserService {
 		return userDao.delSignById(id);
 	}
 
+	@Override
+	public List<SysUser> getPersonList(SysUser data) {
+		//获取登录人id
+		Long userId = UserUtil.getLoginUser().getId();
+		data.setId(userId);
+		List<SysUser> list = userDao.getPersonList(data);
+		if (list.size() > 0) {
+			for (SysUser users : list) {
+				if (StringHelper.isNotEmpty(users.getSignImg())) {
+					users.setSignStatus("已签");
+				} else {
+					users.setSignStatus("未签");
+				}
+			}
+		}
+		return list;
+	}
+
 	/**
 	 * 修改用户
 	 */

src/main/resources/mappers/system/UserMapper.xml

@@ -240,6 +240,41 @@
 		  and p_id=192
 		  and del_flag=0
 	</select>
+    <select id="getPersonList" resultType="com.bonus.aqgqj.model.SysUser">
+		SELECT
+		t.id,
+		t.login_name AS loginName,
+		t.user_name AS username,
+		t.user_code AS userCode,
+		t.sex,
+		t.org_id as orgId,
+		so.org_name as orgName,
+		sr.role_name roleName,
+		t.phone AS phone,
+		t.team_id as teamId,
+		tt.team_name as teamName,
+		CASE
+		t.user_type
+		WHEN '0' THEN
+		'内部用户'
+		WHEN '1' THEN
+		'外部用户' ELSE ''
+		END userType,
+		t.state AS state,
+		t.del_flag AS delFlag,
+		t.sign_img as signImg
+		FROM
+		sys_user t
+		LEFT JOIN sys_role sr ON sr.role_id = t.role_id
+		left join tb_team tt on tt.id = t.team_id and tt.del_flag = 0
+		LEFT JOIN sys_org so ON so.org_id = t.org_id
+		where t.del_flag = 0
+		<if test="username != null and username != ''">
+			and t.user_name like concat('%', #{username}, '%')
+		</if>
+		and t.id=#{id}
+		order by  t.del_flag ASC ,  t.state,t.create_time  DESC
+	</select>
 
     <insert id="saveUserRoles">
 		insert into sys_role_user(roleId, userId) values

src/main/resources/static/js/main.js

@@ -21,15 +21,19 @@ function setExpireData(data){
 	console.log(data)
 	console.log(data.length)
 	if (data.length>0){
-		layer.open({
-			type: 2, // 表示iframe层
-			title: '临期数据',
-			content: 'pages/expireDataList.html?l=' + localStorage.getItem("lang") + '&token=' + localStorage.getItem("token"),
-			area: ['800px', '600px'], // 宽高
-			success: function(layero, index){
-				// 可以在这里做一些操作，比如监听iframe内部的事件
-			}
-		});
+
+		openIframe2("expireDataList", '临期数据', "pages/expireDataList.html", '800px', '600px','');
+
+
+		// layer.open({
+		// 	type: 2, // 表示iframe层
+		// 	title: '临期数据',
+		// 	content: 'pages/expireDataList.html?l=' + localStorage.getItem("lang") + '&token=' + localStorage.getItem("token"),
+		// 	area: ['800px', '600px'], // 宽高
+		// 	success: function(layero, index){
+		// 		// 可以在这里做一些操作，比如监听iframe内部的事件
+		// 	}
+		// });
 	}
 }
 function initMenu(){