bugfix

ruoyi-admin/src/main/java/com/ruoyi/tc/controller/UnitController.java

@@ -3,6 +3,9 @@ package com.ruoyi.tc.controller;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.system.service.ISysUserService;
 import com.ruoyi.tc.entity.Unit;
 import com.ruoyi.tc.entity.request.UnitRequest;
 import com.ruoyi.common.enums.BusinessType;
@@ -44,6 +47,9 @@ public class UnitController {
     @Resource
     private ExamineInfoService examineInfoService;
 
+    @Resource
+    private ISysUserService iSysUserService;
+
     /**
      * 获取单位列表
      */
@@ -130,10 +136,8 @@ public class UnitController {
     @PutMapping
     @Transactional(rollbackFor = Exception.class)
     public AjaxResult edit(@RequestBody Unit x) {
-        Unit byId = unitService.getById(x.getId());
+        //查询用户表是否存在该用户
-        if (!byId.getUserName().equals(x.getUserName()) || !byId.getNickName().equals(x.getNickName())) {
+        unitService.validUser(x);
-            throw new ServiceException("不允许修改单位名称和统一信用代码!");
-        }
         unitService.updateById(x);
         if(!x.getOtherConcat().isEmpty()){
             x.getOtherConcat().forEach(y->{
@@ -159,7 +163,13 @@ public class UnitController {
     public AjaxResult remove(@PathVariable Long id) {
         List<String> userNames = unitService.selectByIds(id);
         //逻辑删除单位和用户
-        unitService.deleteUsers(userNames);
+        if(!userNames.isEmpty()){
+            for (String it : userNames) {
+                if(it!=null){
+                    unitService.deleteUsers(it);
+                }
+            }
+        }
         unitService.deleteUnits(id);
         unitOtherConcatService.deleteByUnitIds(id);
         examineInfoService.deleteByUnitIds(id);

ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/UnitMapper.java

@@ -44,7 +44,7 @@ public interface UnitMapper extends BaseMapper<Unit> {
     /**
      * 逻辑删除用户
      */
-    void deleteUsers(List<String> userNames);
+    void deleteUsers(@Param("userNames") String userNames);
 
     /**
      * 根据id获取详细信息

ruoyi-admin/src/main/java/com/ruoyi/tc/service/UnitService.java

@@ -50,7 +50,7 @@ public interface UnitService extends IService<Unit> {
     /**
      * 逻辑删除用户
      */
-    void deleteUsers(List<String> userNames);
+    void deleteUsers(String userNames);
     /**
      * 逻辑删除单位
      */

ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/UnitServiceImpl.java

@@ -35,8 +35,6 @@ public class UnitServiceImpl extends ServiceImpl<UnitMapper, Unit> implements Un
      */
     @Override
     public Page<Unit> page(Page<Unit> page, UnitRequest unit) {
-
-
         return baseMapper.selectUnitList(page,unit);
     }
 
@@ -61,21 +59,24 @@ public class UnitServiceImpl extends ServiceImpl<UnitMapper, Unit> implements Un
 
 
     /**
-     * 检查用户表是否存在该用户
+     * 检查用户表是否存在该用户，并做新增和修改
      */
     @Override
     public void validUser(Unit x) {
-        SysUser user = new SysUser();
+        if(x.getUserName()!=null && x.getUserName().length()>6){
-        user.setUserName(x.getUserName());
+            SysUser user = new SysUser();
-        user.setPassword(SecurityUtils.encryptPassword(x.getUserName().substring(x.getUserName().length() - 6)));
+            user.setUserName(x.getUserName());
-        user.setNickName(x.getNickName());
+            user.setPassword(SecurityUtils.encryptPassword(x.getUserName().substring(x.getUserName().length() - 6)));
-        SysUser u = userService.selectUserByUserName(x.getUserName());
+            user.setNickName(x.getNickName());
-        if (StringUtils.isNull(u)) {
+            SysUser u = userService.selectUserByUserName(x.getUserName());
-            userService.insertUser(user);
+            if (StringUtils.isNull(u)) {
-            Long[] roles = new Long[]{100L};
+                userService.insertUser(user);
-            userService.insertUserAuth(user.getUserId(), roles);
+                Long[] roles = new Long[]{100L};
-        }else {
+                userService.insertUserAuth(user.getUserId(), roles);
-            throw new ServiceException(x.getUserName() + "'已存在单位!");
+            }else {
+                //只修改用户账号,密码,单位名称
+                userService.updateUserProfile(user);
+            }
         }
     }
 
@@ -90,7 +91,7 @@ public class UnitServiceImpl extends ServiceImpl<UnitMapper, Unit> implements Un
      * 逻辑删除用户
      */
     @Override
-    public void deleteUsers(List<String> userNames) {
+    public void deleteUsers(String userNames) {
         baseMapper.deleteUsers(userNames);
     }
 

ruoyi-admin/src/main/resources/mapper/ExamineInfoMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.tc.mapper.ExamineInfoMapper">
     <update id="deleteByUnitIds">
-        update asset_examine_info set del_flag = '2' where unit_id = #{id}
+        update unit_examine_info set del_flag = '2' where unit_id = #{id}
     </update>
 </mapper>
 

ruoyi-admin/src/main/resources/mapper/UnitMapper.xml

@@ -133,9 +133,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update unit_info set del_flag = '2' where id = #{id}
     </update>
     <update id="deleteUsers">
-        update sys_user set del_flag = '2' where user_name in
+        update sys_user set del_flag = '2' where user_name = #{userNames}
-        <foreach collection="array" item="userNames" open="(" separator="," close=")">
-            #{userNames}
-        </foreach>
     </update>
 </mapper>

ruoyi-admin/src/main/resources/mapper/UnitOtherConcat.xml

@@ -5,9 +5,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.ruoyi.tc.mapper.UnitOtherConcatMapper">
 
     <update id="deleteByUnitIds">
-        update asset_supply_chain set del_flag = '2' where unit_id = #{id}
+        update unit_other_contact set del_flag = '2' where unit_id = #{id}
     </update>
     <update id="deleteByAssetIds">
-        update asset_supply_chain set del_flag = '2' where asset_id = #{id}
+        update unit_other_contact set del_flag = '2' where asset_id = #{id}
     </update>
 </mapper>