Merge remote-tracking branch 'origin/master'

zengh

2022-07-12 63ea601aa950e88237728bf183e30268a3af8616

 src/main/java/org/springblade/modules/system/controller/UserController.java

@@ -583,8 +583,10 @@
            boolean status = userService.updateById(user);
            //qfqk 数据推送
            if (status) {
               User user2 = new User();
               user2.setId(user.getId());
               //删除
               myAsyncService.deleteUserByQfqk(user);
               myAsyncService.deleteUserByQfqk(user2);
               //内网更新
               String s1 =
                  "update blade_user set status = " + "'" + user.getStatus() + "'"
@@ -864,12 +866,15 @@
//      status = userService.updateById(user);
      if (status){
         System.out.println("user = " + user);
         User user2 = userService.getById(user.getId());
         UserDTO userDTO = new UserDTO();
         userDTO.setAccount(user.getAccount());
         userDTO.setPassword(user.getPassword());
         userDTO.setSecurityId(user.getId().toString());
         userDTO.setPhone(user.getPhone());
         userDTO.setAvatar(user.getAvatar());
         userDTO.setPassword(user2.getPassword());
         userDTO.setSecurityId(user2.getId().toString());
         userDTO.setRealName(user1.getRealName());
         userDTO.setPhone(user2.getPhone());
         userDTO.setCardid(user2.getCardid());
         userDTO.setSex(user1.getSex());
         //异步修改群防群控
         myAsyncService.updateUserByAccount(userDTO);
      }
@@ -1082,7 +1087,7 @@
         User user = userService.getById(id);
         User user1 = new User();
         user1.setId(user.getId());
         user1.setCardid(user.getCardid());
//         user1.setCardid(user.getCardid());
         user1.setIsDeleted(1);
         //qfqk 同步
         myAsyncService.deleteUserByQfqk(user1);
@@ -1648,7 +1653,7 @@
            "values(" + "'" + experience.getId() + "'" + "," +
            "'" + experience.getName() + "'" + "," +
            "'" + experience.getPost() + "'" + "," +
            "," + "'" + new SimpleDateFormat("yyyy-MM-dd").format(experience.getEntrytime()) + "'" +
            "'" + new SimpleDateFormat("yyyy-MM-dd").format(experience.getEntrytime()) + "'" +
            "," + "'" + experience.getCardid() + "'" +
            "," + "'" + experience.getCompanyname() + "'" +
            "," + "'" + experience.getSecurityid() + "'"
@@ -1939,8 +1944,8 @@

         //内网同步
         String s = "insert into sys_experience(id,name,entryTime,departureTime,leaving,cardId,companyname,securityId) " +
            "values(" + "'" + experience.getId() + "'" + "," +
            "'" + experience.getName() + "'" + "," +
            "values(" + "'" + experience.getId() + "'" +
            "," + "'" + experience.getName() + "'" +
            "," + "'" + new SimpleDateFormat("yyyy-MM-dd").format(experience.getEntrytime()) + "'" +
            "," + "'" + new SimpleDateFormat("yyyy-MM-dd").format(experience.getDeparturetime()) + "'" +
            "," + "'" + experience.getLeaving() + "'" +