Merge branch 'lal' into 'develop'

Lal

See merge request 8timerv2/8timerapiv200!341

src/main/java/cn/timer/api/controller/kqgl/AttController.java

@@ -73,6 +73,7 @@ import cn.timer.api.bean.kqgl.SpecialDate;
 import cn.timer.api.bean.kqgl.SystemShift;
 import cn.timer.api.bean.kqgl.SystemShift;
 import cn.timer.api.bean.kqgl.UserAttendanceRel;
 import cn.timer.api.bean.kqgl.UserAttendanceRel;
 import cn.timer.api.bean.kqgl.UserEquiRelation;
 import cn.timer.api.bean.kqgl.UserEquiRelation;
+import cn.timer.api.bean.kqmk.KqglAssoYhsb;
 import cn.timer.api.bean.yggl.YgglMainEmp;
 import cn.timer.api.bean.yggl.YgglMainEmp;
 import cn.timer.api.config.Initialization.StaticVariable;
 import cn.timer.api.config.Initialization.StaticVariable;
 import cn.timer.api.config.annotation.CurrentUser;
 import cn.timer.api.config.annotation.CurrentUser;
@@ -1429,6 +1430,7 @@ public class AttController {
 						AttendanceMachine kqj = attendancemachineservice.selectByPrimaryKey(abp.getDkfsid());//查询考勤机“序列号”
 						AttendanceMachine kqj = attendancemachineservice.selectByPrimaryKey(abp.getDkfsid());//查询考勤机“序列号”
 						UserEquiRelation kqjry = userequirelationmapper.selectByuserIdkqjid(Integer.valueOf(attser[u]), kqj.getId());
 						UserEquiRelation kqjry = userequirelationmapper.selectByuserIdkqjid(Integer.valueOf(attser[u]), kqj.getId());
 						if(kqjry == null) {
 						if(kqjry == null) {
+							KqglAssoYhsb.builder().build().delete(new QueryWrapper<KqglAssoYhsb>().lambda().eq(KqglAssoYhsb::getUserId, attser[u]).eq(KqglAssoYhsb::getKqjid, kqj.getId()));
 							//用户与设备关系(考勤机id-->用户id)
 							//用户与设备关系(考勤机id-->用户id)
 							UserEquiRelation uskqj = new UserEquiRelation();
 							UserEquiRelation uskqj = new UserEquiRelation();
 							uskqj.setUserId(Integer.valueOf(attser[u]));//用户id
 							uskqj.setUserId(Integer.valueOf(attser[u]));//用户id
@@ -1443,6 +1445,7 @@ public class AttController {
 							userequirelationmapper.insert(uskqj);
 							userequirelationmapper.insert(uskqj);
 						}
 						}
 						
 						
+						
 						YgglMainEmp yggluser = YgglMainEmp.builder().build().selectOne(new QueryWrapper<YgglMainEmp>().lambda().eq(YgglMainEmp::getOrgCode, userBean.getOrgCode()).eq(YgglMainEmp::getEmpNum, attser[u]));
 						YgglMainEmp yggluser = YgglMainEmp.builder().build().selectOne(new QueryWrapper<YgglMainEmp>().lambda().eq(YgglMainEmp::getOrgCode, userBean.getOrgCode()).eq(YgglMainEmp::getEmpNum, attser[u]));
 						String url = mac_command+"/addUserName";
 						String url = mac_command+"/addUserName";
 				        HttpHeaders headers = new HttpHeaders();
 				        HttpHeaders headers = new HttpHeaders();

src/main/java/cn/timer/api/controller/kqgl/TimeCardController.java

@@ -1341,6 +1341,9 @@ public class TimeCardController {
 					KqglAssoKqj kqj = KqglAssoKqj.builder().id(abp.getDkfsid()).build().selectById();
 					KqglAssoKqj kqj = KqglAssoKqj.builder().id(abp.getDkfsid()).build().selectById();
 					KqglAssoYhsb kqjry = KqglAssoYhsb.builder().build().selectOne(new QueryWrapper<KqglAssoYhsb>().lambda().eq(KqglAssoYhsb::getUserId, Integer.valueOf(attser[u])).eq(KqglAssoYhsb::getKqjid, kqj.getId()));
 					KqglAssoYhsb kqjry = KqglAssoYhsb.builder().build().selectOne(new QueryWrapper<KqglAssoYhsb>().lambda().eq(KqglAssoYhsb::getUserId, Integer.valueOf(attser[u])).eq(KqglAssoYhsb::getKqjid, kqj.getId()));
 					if(kqjry == null) {
 					if(kqjry == null) {
+						
+						KqglAssoYhsb.builder().build().delete(new QueryWrapper<KqglAssoYhsb>().lambda().eq(KqglAssoYhsb::getUserId, attser[u]).eq(KqglAssoYhsb::getKqjid, kqj.getId()));
+						
 						KqglAssoYhsb uskqj = KqglAssoYhsb.builder().userId(Integer.valueOf(attser[u])).kqjid(kqj.getId()).type(1).build();
 						KqglAssoYhsb uskqj = KqglAssoYhsb.builder().userId(Integer.valueOf(attser[u])).kqjid(kqj.getId()).type(1).build();
 						
 						
 						UserEquiRelation isgly = userequirelationmapper.selectByuserId(Integer.valueOf(attser[u]));
 						UserEquiRelation isgly = userequirelationmapper.selectByuserId(Integer.valueOf(attser[u]));
@@ -1352,7 +1355,6 @@ public class TimeCardController {
 						if (!uskqj.insert()) 
 						if (!uskqj.insert()) 
 							return ResultUtil.error("操作失败--新增用户与设备关系");
 							return ResultUtil.error("操作失败--新增用户与设备关系");
 						
 						
-						
 						YgglMainEmp yggluser = YgglMainEmp.builder().build().selectOne(new QueryWrapper<YgglMainEmp>().lambda().eq(YgglMainEmp::getOrgCode, userBean.getOrgCode()).eq(YgglMainEmp::getEmpNum, attser[u]));
 						YgglMainEmp yggluser = YgglMainEmp.builder().build().selectOne(new QueryWrapper<YgglMainEmp>().lambda().eq(YgglMainEmp::getOrgCode, userBean.getOrgCode()).eq(YgglMainEmp::getEmpNum, attser[u]));
 						
 						
 						String url = mac_command+"/addUserName";
 						String url = mac_command+"/addUserName";