Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/WeiXinCorpController.java

@@ -3291,70 +3291,62 @@ public class WeiXinCorpController {
 
     //为超级管理员角色赋予模块权限
     private void rootRole (Integer companyId){
-        System.err.println("##############################为超级管理员开通模块及权限");
         Company company = companyMapper.selectById(companyId);
-        SysRole sysRole = sysRoleMapper.selectOne(new QueryWrapper<SysRole>().eq("company_id", companyId).eq("rolename", "超级管理员"));
-        QueryWrapper<SysModule> sysModuleQueryWrapper = new QueryWrapper<>();
-        //项目协作平台
-        if (company.getPackageProject().equals(1)){
-            sysModuleQueryWrapper.or().eq("package_project", 1);
-        }
-        //OA平台;请假，出差等
-        if (company.getPackageOa().equals(1)){
-            sysModuleQueryWrapper.or().eq("package_oa", 1);
-        }
-        //费用报销
-        if (company.getPackageExpense().equals(1)){
-            sysModuleQueryWrapper.or().eq("package_expense", 1);
-        }
-        //客户管理
-        if (company.getPackageCustomer().equals(1)){
-            sysModuleQueryWrapper.or().eq("package_customer", 1);
-        }
-        //工程专业
-        if (company.getPackageEngineering().equals(1)){
-            sysModuleQueryWrapper.or().eq("package_engineering", 1);
-        }
-        //供应商模块
-        if (company.getPackageProvider().equals(1)){
-            sysModuleQueryWrapper.or().eq("package_provider", 1);
-        }
-        List<SysModule> sysModules = sysModuleMapper.selectList(sysModuleQueryWrapper);
-        //过滤掉已开通的模块
-        List<SysRoleModule> modular = sysRoleModuleMapper.selectList(new QueryWrapper<SysRoleModule>().eq("role_id", sysRole.getId()));
-        List<Integer> modularCollect = modular.stream().map((m) -> m.getModuleId()).distinct().collect(Collectors.toList());
-        List<SysModule> collect = sysModules.stream().filter((s) -> {
-            Boolean flag = true;
-            for (Integer integer : modularCollect) {
-                if (s.getId().equals(integer)){
-                    flag = false;
+        if (company.getPackageOa().equals(1) || company.getPackageCustomer().equals(1) || company.getPackageEngineering().equals(1)){
+            System.err.println("##############################为超级管理员开通模块及权限");
+            SysRole sysRole = sysRoleMapper.selectOne(new QueryWrapper<SysRole>().eq("company_id", companyId).eq("rolename", "超级管理员"));
+            QueryWrapper<SysModule> sysModuleQueryWrapper = new QueryWrapper<>();
+            if (company.getPackageOa().equals(1)){
+                sysModuleQueryWrapper.or().eq("package_oa", 1);
+            }
+            //客户管理
+            if (company.getPackageCustomer().equals(1)){
+                sysModuleQueryWrapper.or().eq("package_customer", 1);
+            }
+            //工程专业
+            if (company.getPackageEngineering().equals(1)){
+                sysModuleQueryWrapper.or().eq("package_engineering", 1);
+            }
+            List<SysModule> sysModules = sysModuleMapper.selectList(sysModuleQueryWrapper);
+            //过滤掉已开通的模块
+            List<SysRoleModule> modular = sysRoleModuleMapper.selectList(new QueryWrapper<SysRoleModule>().eq("role_id", sysRole.getId()));
+            List<Integer> modularCollect = modular.stream().map((m) -> m.getModuleId()).distinct().collect(Collectors.toList());
+            List<SysModule> collect = sysModules.stream().filter((s) -> {
+                Boolean flag = true;
+                for (Integer integer : modularCollect) {
+                    if (s.getId().equals(integer)){
+                        flag = false;
+                    }
+                }
+                return flag;
+            }).collect(Collectors.toList());
+            if (collect.size()>0){
+                //进行模块权限添加
+                ArrayList<SysRoleModule> sysRoleModules = new ArrayList<>();
+                for (SysModule sysModule : collect) {
+                    SysRoleModule sysRoleModule = new SysRoleModule();
+                    sysRoleModule.setRoleId(sysRole.getId());
+                    sysRoleModule.setModuleId(sysModule.getId());
+                    sysRoleModules.add(sysRoleModule);
                 }
+                sysRoleModuleService.saveBatch(sysRoleModules);
+                System.out.println("########################################");
+                System.err.println(company.getCompanyName() + "已开通模块；" + sysRoleModules.toString());
+                List<Integer> sysModulesId = collect.stream().map((s) -> s.getId()).collect(Collectors.toList());
+                List<SysFunction> sysFunctions = sysFunctionMapper.selectList(new QueryWrapper<SysFunction>().in("module_id", sysModulesId));
+                //进行权限添加
+                ArrayList<SysRoleFunction> sysRoleFunctions = new ArrayList<>();
+                for (SysFunction sysFunction : sysFunctions) {
+                    SysRoleFunction sysRoleFunction = new SysRoleFunction();
+                    sysRoleFunction.setRoleId(sysRole.getId());
+                    sysRoleFunction.setFunctionId(sysFunction.getId());
+                    sysRoleFunctions.add(sysRoleFunction);
+                }
+                sysRoleFunctionService.saveBatch(sysRoleFunctions);
+                System.out.println("########################################");
+                System.err.println(company.getCompanyName() + "已开通权限；" + sysRoleModules.toString());
             }
-            return flag;
-        }).collect(Collectors.toList());
-        //进行模块权限添加
-        ArrayList<SysRoleModule> sysRoleModules = new ArrayList<>();
-        for (SysModule sysModule : collect) {
-            SysRoleModule sysRoleModule = new SysRoleModule();
-            sysRoleModule.setRoleId(sysRole.getId());
-            sysRoleModule.setModuleId(sysModule.getId());
-            sysRoleModules.add(sysRoleModule);
-        }
-        sysRoleModuleService.saveBatch(sysRoleModules);
-        System.out.println("########################################");
-        System.err.println(company.getCompanyName() + "已开通模块；" + sysRoleModules.toString());
-        List<Integer> sysModulesId = collect.stream().map((s) -> s.getId()).collect(Collectors.toList());
-        List<SysFunction> sysFunctions = sysFunctionMapper.selectList(new QueryWrapper<SysFunction>().in("module_id", sysModulesId));
-        ArrayList<SysRoleFunction> sysRoleFunctions = new ArrayList<>();
-        for (SysFunction sysFunction : sysFunctions) {
-            SysRoleFunction sysRoleFunction = new SysRoleFunction();
-            sysRoleFunction.setRoleId(sysRole.getId());
-            sysRoleFunction.setFunctionId(sysFunction.getId());
-            sysRoleFunctions.add(sysRoleFunction);
-        }
-        sysRoleFunctionService.saveBatch(sysRoleFunctions);
-        System.out.println("########################################");
-        System.err.println(company.getCompanyName() + "已开通权限；" + sysRoleModules.toString());
+        }
     }
 
 }

fhKeeper/formulahousekeeper/timesheet/src/components/select.vue

@@ -56,7 +56,7 @@
 
                     <span v-if="multiSelect" style="width: 100%">
                         <span :class="item.flg ? 'hoverSpan hoverSpanHover' : 'hoverSpan'">
-                            <span>
+                            <span style="width: 100%;display: inline-block;">
                                 <ww-open-data type='userName' :openid='item.name'></ww-open-data>
                                 <!-- {{item.name}} -->
                                 <span v-if="item.jobNumber" class="spanFllat">{{item.jobNumber}}</span>

fhKeeper/formulahousekeeper/timesheet/src/views/Home.vue

@@ -17,7 +17,7 @@
                 </div>
             </el-col>
 
-            <el-col :span="12" class="userinfo">
+            <el-col :span="12" class="userinfo" style="display: flex;align-items: center;justify-content: flex-end;">
                 <!-- 中英文切换入口 -->
                 <!-- <el-dropdown trigger="click" @command="langChange" style="margin-right:30px;">
                     <span class="el-dropdown-link userinfo-inner">

fhKeeper/formulahousekeeper/timesheet/src/views/project/cost.vue

@@ -437,15 +437,19 @@
                     this.allListData = arrlist
                     // this.gtff()
                     if(this.user.userNameNeedTranslate == '1') {
-                        let list = arrlist.list
-                        let dealWithList = []
-                        for(var i in list) {
-                            let obj = {}
-                            obj.type = list[i].type
-                            obj.id = list[i].name
-                            dealWithList.push(obj)
+                        if(arrlist.list.length > 0) {
+                            let list = arrlist.list
+                            let dealWithList = []
+                            for(var i in list) {
+                                let obj = {}
+                                obj.type = list[i].type
+                                obj.id = list[i].name
+                                dealWithList.push(obj)
+                            }
+                            this.dealWithTranslationPlone(dealWithList)
+                        } else {
+                            this.getUserCostList()
                         }
-                        this.dealWithTranslationPlone(dealWithList)
                     } else {
                         this.allListData = arrlist
                         this.gtff()