注释部分sql报错

user-service/src/main/java/com/diagbot/facade/UserFacade.java

@@ -785,6 +785,7 @@ public class UserFacade extends UserServiceImpl {
      */
     public RespDTO<Boolean> auditUserInfoAlls(UserInfoAuditVO userInfoAuditVO) {
         Map<String, Object> auditMap = new HashMap<String, Object>();
+        auditMap.put("orderNum", userInfoAuditVO.getOrderNum());
         auditMap.put("userId", userInfoAuditVO.getUserId());
         auditMap.put("modifier", UserUtils.getCurrentPrincipleID());
         auditMap.put("gmtModified", DateUtil.now());
@@ -860,6 +861,7 @@ public class UserFacade extends UserServiceImpl {
         user.setPassword(entryPassword);
         user.setLinkman(userAndOrganizationVO.getLinkman());
         user.setGmtCreate(DateUtil.now());
+        user.setPosition(userAndOrganizationVO.getPosition());// 岗位信息
         user.setEmail(userAndOrganizationVO.getEmail());
         save(user);
 
@@ -869,7 +871,7 @@ public class UserFacade extends UserServiceImpl {
         userAuthentication.setCreator(UserUtils.getCurrentPrincipleID());//
         // 创建人Id
         userAuthentication.setGmtCreate(DateUtil.now());// 记录创建时间
-        userAuthentication.setPosition(userAndOrganizationVO.getPosition());// 岗位信息
+        //
         userAuthentication.setUserId(userId);// 用户id
         userAuthentication.setIsReject(RejectEnum.PASS.getKey());// 是否通过认证 0:未通过，1:已通过
         userAuthentication.setStatus(AuthStatusEnum.Authorized.getKey());// 认证状态（0：未认证，1：已认证，2：认证中）

user-service/src/main/java/com/diagbot/vo/UserInfoAuditVO.java

@@ -21,5 +21,7 @@ public class UserInfoAuditVO {
     private Integer status;//认证状态（0：未认证，1：已认证，2：认证中）
     @NotNull(message = "请输入用户id")
     private Long userId;//用户id
-
+    @NotNull(message = "请输入申请单号")
+    private String orderNum;//申请单号
+    
 }

user-service/src/main/java/com/diagbot/web/UserInfoController.java

@@ -88,7 +88,7 @@ public class UserInfoController {
         return userFacade.updateUserInfoAlls(userInfoOrganizationsVO);
     }
 
-    @ApiOperation(value = "审核用户信息和机构信息[by:wangfeng]", notes = "审核用户信息和机构信息")
+    @ApiOperation(value = "审核用户信息和机构信息(新)[by:wangfeng]", notes = "审核用户信息和机构信息")
     @PostMapping("/auditUserInfoAll")
     @SysLogger("auditUserInfoAll")
     @Transactional
@@ -96,7 +96,7 @@ public class UserInfoController {
         return userFacade.auditUserInfoAlls(userInfoAuditVO);
     }
 
-    @ApiOperation(value = "删除用户信息和机构信息[by:wangfeng]", notes = "用户信息和机构信息")
+    @ApiOperation(value = "删除用户信息和机构信息(新)[by:wangfeng]", notes = "用户信息和机构信息")
     @PostMapping("/updateDeleted")
     @SysLogger("updateDeleted")
     @Transactional

user-service/src/main/resources/mapper/UserMapper.xml

@@ -132,7 +132,7 @@
         org.address as orgAddress,
         org.parent_id as orgParent_id,
         org.sub_num as orgSub_num,
-        aut.position as autPosition,
+        u.position as autPosition,
         aut.is_reject as autIsReject,
         aut.status as autStatus
         FROM sys_user u
@@ -250,8 +250,9 @@
             <if test="auditMap.status != null">STATUS= #{auditMap.status}</if>
         </trim>
         WHERE
-        user_id = #{auditMap.userId}
-        AND is_deleted = "N"
+        is_deleted = "N"
+        AND user_id = #{auditMap.userId}
+        AND order_num = #{auditMap.orderNum}
 
     </update>
 
@@ -273,7 +274,7 @@
         org.address as orgAddress,
         org.parent_id as orgParent_id,
         org.sub_num as orgSub_num,
-        aut.position as autPosition,
+        u.position as autPosition,
         aut.is_reject as autIsReject,
         aut.status as autStatus
         FROM sys_user u
@@ -399,7 +400,7 @@
         org.parent_id AS orgParent_id,
         org.sub_num AS orgSub_num,
         aut.certification_date AS certificationDate,
-        aut.position AS autPosition,
+        u.position AS autPosition,
         aut.status AS autStatus
         FROM sys_user u
         LEFT JOIN sys_user_organization uorg ON u.id = uorg.user_id
@@ -433,7 +434,7 @@
         org.address AS orgAddress,
         org.parent_id AS orgParent_id,
         org.sub_num AS orgSub_num,
-        aut.position AS autPosition,
+        u.position AS autPosition,
         aut.status AS autStatus
         FROM sys_user u
         LEFT JOIN sys_user_organization uorg ON u.id = uorg.user_id
@@ -524,7 +525,7 @@
         org.address AS orgAddress,
         org.parent_id AS orgParent_id,
         org.sub_num AS orgSub_num,
-        aut.position AS autPosition,
+        u.position AS autPosition,
         aut.is_reject AS autIsReject,
         aut.status AS autStatus
         FROM