删除超管添加内容

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

@@ -911,11 +911,8 @@ public class UserFacade extends UserServiceImpl {
         map.put("userId", baseIdVO.getId());
         map.put("modifier", UserUtils.getCurrentPrincipleID());
         map.put("gmtModified", DateUtil.now());
-        boolean res = updateDeleted(map);
-        if (!res) {
-            throw new CommonException(CommonErrorCode.UPDATE_INFO_FAIL);
-        }
-        return RespDTO.onSuc(res);
+        updateDeleted(map);
+        return RespDTO.onSuc(true);
     }
 
     /**

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

@@ -211,22 +211,27 @@
 
     <update id="updateDeleted" parameterType="java.util.Map">
         UPDATE sys_user u ,sys_user_organization a ,
-        sys_organization b,sys_user_authentication c
-        SET u.is_deleted = "Y",a.is_deleted= "Y",b.is_deleted= "Y",c.is_deleted="Y"
+        sys_organization b,sys_user_authentication c, sys_user_role r
+        SET u.is_deleted = "Y",a.is_deleted= "Y",b.is_deleted= "Y",c.is_deleted="Y", r.is_deleted="Y"
         <if test="map.gmtModified !=null">
             ,u.gmt_modified=#{map.gmtModified}
+            ,a.gmt_modified=#{map.gmtModified}
             ,b.gmt_modified=#{map.gmtModified}
             ,c.gmt_modified=#{map.gmtModified}
+            ,r.gmt_modified=#{map.gmtModified}
         </if>
         <if test="map.modifier != null">
             ,u.modifier=#{map.modifier}
+            ,a.modifier=#{map.modifier}
             ,b.modifier=#{map.modifier}
             ,c.modifier=#{map.modifier}
+            ,r.modifier=#{map.modifier}
         </if>
         WHERE u.id = #{map.userId}
         AND c.user_id= #{map.userId}
         AND a.user_id = #{map.userId}
         AND a.organization_id =b.id
+        AND r.user_id= #{map.userId}
     </update>
     <update id="auditUserInfoAll" parameterType="java.util.Map">
         UPDATE sys_user_authentication