删除的用户可以登录系统

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/CompanyServiceImpl.java

@@ -316,9 +316,13 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
     public HttpRespMsg getRelatedProducerList(Integer companyId) {
         HttpRespMsg msg = new HttpRespMsg();
         List<AssetCustomCompany> assert_id = assetCustomCompanyMapper.selectList(new QueryWrapper<AssetCustomCompany>().eq("assert_id", companyId));
-        int[] ints = assert_id.stream().mapToInt(AssetCustomCompany::getCustomId).toArray();
-        List<Integer> integers = ListUtil.convertFromIntArray(ints);
-        msg.data = companyMapper.selectList(new QueryWrapper<Company>().in("id", integers));
+        if (assert_id.size() > 0) {
+            int[] ints = assert_id.stream().mapToInt(AssetCustomCompany::getCustomId).toArray();
+            List<Integer> integers = ListUtil.convertFromIntArray(ints);
+            msg.data = companyMapper.selectList(new QueryWrapper<Company>().in("id", integers));
+        } else {
+            msg.data = new ArrayList<>();
+        }
         return msg;
     }
 

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/MouldFileServiceImpl.java

@@ -669,7 +669,9 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
         User currentUser = userMapper.selectOne(new QueryWrapper<User>().eq("head_imgurl", userVO.getToken()));
         PageHelper.startPage(page.getPageNum(), page.getPageSize());
         if (currentUser != null) {
-            if (Constant.SYS_ID.equals(currentUser.getParentId())) {
+            if (currentUser.getIsDisable() == 1) {
+                list = new ArrayList<>();
+            } else if (Constant.SYS_ID.equals(currentUser.getParentId())) {
                 //此时是admin，查询他所创建的项目
                 QueryWrapper<Project> qw = new QueryWrapper<>();
                 List<Project> projects = projectMapper.selectList(qw.eq("creator_id", currentUser.getId()));

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/ProjectServiceImpl.java

@@ -301,7 +301,10 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             List<Integer> uIds = new ArrayList<>();
             List<ProjectVO> projects = new ArrayList<>();
             List<Integer> projectIds = new ArrayList<>();
-            if (Constant.SYS_PARENT_ID.equals(user.getParentId())) {
+            if (user.getIsDisable() == 1) {
+                //被删除了
+                projects = new ArrayList<ProjectVO>();
+            } else if (Constant.SYS_PARENT_ID.equals(user.getParentId())) {
                 projects = projectMapper.getProjectListByUid(keyName, user);
             } else if (Constant.SYS_ID.equals(user.getParentId())) {
                 if (user.getSubordinateType() == 0) {

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/UserServiceImpl.java

@@ -22,6 +22,7 @@ import org.springframework.web.client.RestTemplate;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.io.Serializable;
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
@@ -68,6 +69,11 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     public static final String GET_TOKEN_URL = "https://api.weixin.qq.com/sns/oauth2/access_token?appid=APPID&secret=SECRET&code=CODE&grant_type=authorization_code";
     public static final String GET_USERINFO_URL = "https://api.weixin.qq.com/sns/userinfo?access_token=accessToken&openid=openId&lang=zh_CN";
 
+    @Override
+    public boolean removeById(Serializable id) {
+        return super.removeById(id);
+    }
+
     @Override
     public HttpRespMsg login(UserVO userVO, boolean checkFirst, HttpServletRequest request) {
         System.out.println("user account== " + userVO.getAccount());
@@ -121,7 +127,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         PageHelper.startPage(page.getPageNum(), page.getPageSize());
         List<UserVO> users = new ArrayList<>();
         List<Integer> uIds = new ArrayList<>();
-        if (Constant.SYS_PARENT_ID.equals(user.getParentId())) {
+        if (user.getIsDisable() == 1) {
+            users = new ArrayList<>();
+        } else if (Constant.SYS_PARENT_ID.equals(user.getParentId())) {
             users = userMapper.selectListByCondition(roleType, companyId, flag, user, keyName);
         } else if (Constant.SYS_ID.equals(user.getParentId())) {
             if (user.getSubordinateType() == 0) {
@@ -293,7 +301,11 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
             return msg;
         }
         //删除用户
-        userMapper.deleteById(user.getId());
+        user.setCompanyId(-1);
+        user.setIsDisable(1);
+        //虚拟删除
+        userMapper.updateById(user);
+//        userMapper.deleteById(user.getId());
         //删除合作的公司
         userCompanyMapper.delete(new QueryWrapper<UserCompany>().eq("user_id", user.getId()));
         return msg;

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/VnoticeUserServiceImpl.java

@@ -47,18 +47,18 @@ public class VnoticeUserServiceImpl extends ServiceImpl<VnoticeUserMapper, Vnoti
         List<VnoticeUser> list = new ArrayList<>();
         User user = userMapper.selectOne(new QueryWrapper<User>().eq("head_imgurl", token));
         List<Map<String, Object>> mapList = new ArrayList<>();
-        if (user != null) {
+        if (user != null ) {
             Map<String, Object> map = new HashMap<>();
             //加载全部
             PageHelper.startPage(page.getPageNum(), page.getPageSize());
-            list = vnoticeUserMapper.selectList(new QueryWrapper<VnoticeUser>().eq("user_id", user.getId()).eq("notice_type", Constant.APPROVEL_TYPE).orderByDesc("id").last(""));
+            list = user.getIsDisable() == 0?vnoticeUserMapper.selectList(new QueryWrapper<VnoticeUser>().eq("user_id", user.getId()).eq("notice_type", Constant.APPROVEL_TYPE).orderByDesc("id").last("")):new ArrayList<>();
             long count1 = list.stream().filter(x -> x.getIsRead() == 0).count();
             PageInfo<VnoticeUser> pageInfo = new PageInfo<VnoticeUser>(list);
             map.put("approvelList", pageInfo);
             map.put("isNotReadCount", count1);
             mapList.add(map);
             PageHelper.startPage(page.getPageNum(), page.getPageSize());
-            List<VnoticeUser> list1 = vnoticeUserMapper.selectList(new QueryWrapper<VnoticeUser>().eq("user_id", user.getId()).eq("notice_type",Constant.MAINTAIN_TYPE).orderByDesc("id"));
+            List<VnoticeUser> list1 = user.getIsDisable() == 0?vnoticeUserMapper.selectList(new QueryWrapper<VnoticeUser>().eq("user_id", user.getId()).eq("notice_type",Constant.MAINTAIN_TYPE).orderByDesc("id")):new ArrayList<>();
             long count2 = list1.stream().filter(x -> x.getIsRead() == 0).count();
             PageInfo<VnoticeUser> pageInfo1 = new PageInfo<VnoticeUser>(list1);
             Map<String, Object> map1 = new HashMap<>();
@@ -66,7 +66,7 @@ public class VnoticeUserServiceImpl extends ServiceImpl<VnoticeUserMapper, Vnoti
             map1.put("isNotReadCount", count2);
             mapList.add(map1);
             PageHelper.startPage(page.getPageNum(), page.getPageSize());
-            List<VnoticeUser> list2 = vnoticeUserMapper.selectList(new QueryWrapper<VnoticeUser>().eq("user_id", user.getId()).eq("notice_type",Constant.EMERGENCY_TYPE).orderByDesc("id"));
+            List<VnoticeUser> list2 = user.getIsDisable() == 0?vnoticeUserMapper.selectList(new QueryWrapper<VnoticeUser>().eq("user_id", user.getId()).eq("notice_type",Constant.EMERGENCY_TYPE).orderByDesc("id")):new ArrayList<>();
             long count3 = list2.stream().filter(x -> x.getIsRead() == 0).count();
             PageInfo<VnoticeUser> pageInfo2 = new PageInfo<VnoticeUser>(list2);
             Map<String, Object> map2 = new HashMap<>();

cloud-model/src/main/resources/application.properties

@@ -56,7 +56,15 @@ spring.datasource.hikari.minimum-idle=3
 spring.datasource.hikari.maximum-pool-size=10
 spring.datasource.hikari.max-lifetime =30000
 spring.datasource.hikari.connection-test-query=SELECT 1
+
+#log
 logging.path=C:/log/
+#ÅäÖÃÎļþ×î´ó10M
+logging.file.max-size=10MB
+logging.file.max-history=30
+logging.level.root=WARN
+logging.level.org.springframework.web=INFO
+
 
 wxAppId=wx42c0f9d19a4756a7
 wxAppSecret=473ee2fab33e6d8a885800403d777581

cloud-model/src/main/resources/mapper/UserMapper.xml

@@ -84,6 +84,7 @@
         ON u.company_id = c.`id`
         <where>
             u.id != #{user.id}
+            and u.is_disable = 0
             <if test="user.id != 1">
                 AND u.parent_id = #{user.id}
             </if>
@@ -116,6 +117,7 @@
             </foreach>
             or u.parent_id = #{user.id})
             and u.id != #{user.id}
+            and u.is_disable = 0
             <if test="flag==0 and keyName != '' and keyName !=null">
                 AND u.username like concat('%',#{keyName},'%')
             </if>

ys_int/src/views/base/factoryDetail.vue

@@ -46,14 +46,14 @@
                 </el-col>
             </el-col>
 
-            <el-col :span="24" class="main">
+            <!-- <el-col :span="24" class="main">
                 <el-col :span="24" class="detail">
                     {{$t('basic.proAsset')}}：
                     <span class="info" v-for="(item,index) in data.relateCompanyList" :key="item.id">{{item.companyName}}
                         <span v-if="index != data.relateCompanyList.length-1">、</span>
                     </span>
                 </el-col>
-            </el-col>
+            </el-col> -->
             <el-col :span="24" class="main">
                 <el-col :span="24" class="detail">
                     {{$t('basic.proAddress')}}：

ys_int/src/views/map/map.vue

@@ -115,7 +115,17 @@
                             var textMetrics = labelCtx.measureText(text);
                             var halfTxtWidth = textMetrics.width / 2;
 
-                            var num = dataItems.length;
+                            var num = 0;//dataItems.length;
+                            
+                            //计算云模盒数量， 数据中有的是工厂，需要获取工厂内的云模盒
+                            for (var i=0;i<dataItems.length; i++) {
+                                if (dataItems[i].dataItem.type == 0) {
+                                    num += dataItems[i].dataItem.children.length;
+                                } else {
+                                    num++;
+                                }
+                            }
+                            
                             var numMetrics = labelCtx.measureText(num);
                             var halfNumWidth = numMetrics.width / 2;
 

ys_int/src/views/project/project.vue

@@ -9,7 +9,7 @@
 				<el-form-item>
 					<el-button type="primary" v-on:click="getProject">{{$t('base.query')}}</el-button>
 				</el-form-item>
-				<el-form-item style="float:right;" v-if="user.parentId == 1 && user.subordinateType == 0">
+				<el-form-item style="float:right;" v-if="user.isDisable == 0 && (user.parentId == 1 && user.subordinateType == 0)">
 					<el-button type="primary" @click="handleAdd">{{$t('base.add')}}</el-button>
 				</el-form-item>
 			</el-form>

ys_int/src/views/project/staff.vue

@@ -25,7 +25,7 @@
 				<el-form-item>
 					<el-button type="primary" @click="getUsers">{{$t('base.query')}}</el-button>
 				</el-form-item>
-				<el-form-item style="float:right;" v-if="user.subordinateType == 0 || user.isManager == 1">
+				<el-form-item style="float:right;" v-if="user.isDisable == 0 && (user.subordinateType == 0 || user.isManager == 1)">
 					<el-button type="primary" @click="handleAdd">{{$t('base.add')}}</el-button>
 				</el-form-item>
 			</el-form>