.gitignore | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
pom.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/crm/common/CodeBuilder.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/crm/common/web/BaseController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/crm/manager/mapper/CstmrMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/crm/manager/service/CstmrService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/crm/manager/service/impl/CstmrServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/crm/system/entity/User.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/resources/application.yml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/resources/mapper/CstmrMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/webapp/mould/甲方单位导入模板.xls | 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/webapp/static/js/cool.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
.gitignore
@@ -31,3 +31,4 @@ ### VS Code ### .vscode/ src/main/resources/application.yml pom.xml
@@ -112,6 +112,23 @@ <artifactId>okhttp</artifactId> <version>3.10.0</version> </dependency> <dependency> <groupId>org.apache.poi</groupId> <artifactId>poi-ooxml</artifactId> <version>3.12</version> </dependency> <dependency> <groupId>org.apache.poi</groupId> <artifactId>poi</artifactId> <version>3.12</version> </dependency> <dependency> <groupId>org.apache.poi</groupId> <artifactId>poi-ooxml-schemas</artifactId> <version>3.12</version> </dependency> </dependencies> <build> src/main/java/com/zy/crm/common/CodeBuilder.java
@@ -17,13 +17,13 @@ // generator.password="xltys1995"; // generator.table="sys_host"; // sqlserver generator.url="47.97.1.152:51433;databasename=zy_crm"; generator.url="192.168.4.15:1433;databasename=zy_crm"; generator.username="sa"; generator.password="Zoneyung@zy56$"; generator.password="sa@123"; // generator.url="localhost:1433;databasename=zy_crm"; // generator.username="sa"; // generator.password="sa@123"; generator.table="man_plan_foll"; generator.table="man_pri_quote_budget"; generator.packagePath="com.zy.crm.manager"; generator.js = false; generator.html = false; src/main/java/com/zy/crm/common/web/BaseController.java
@@ -223,4 +223,41 @@ wrapper.like(columns.get(i), condition); } } //è·åå½åç»å½ç¨æ·ï¼å¯¹åºæé䏿æç¨æ·idãï¼æ®éèåè·åèªå·±ï¼é¢å¯¼è·åèªå·±åä¸å±ï¼è¶ 级管çåå ¨é¨ï¼ protected ArrayList<Long> getUserRoleBelongsToUserId() { User user = getUser(); ArrayList<Long> userIds = new ArrayList<>(); if (user.getRoleCode().equals("boss")) { //å ¨é¨æé userIds = null; } else if (user.getRoleCode().equals("manager")) { //èªå·±åä¸å±æé userIds.add(getUserId()); EntityWrapper<User> entityWrapper = new EntityWrapper<>(); entityWrapper.eq("dept_id", user.getDeptId()); List<User> userList = userService.selectList(entityWrapper); for (User item : userList) { userIds.add(item.getId()); } }else{ //èªå·±æé userIds.add(getUserId()); } return userIds; } protected ArrayList<Long> getUserRoleBelongsToUserId(String permission) { User user = getUser(); if (user.getDeptName().equals("å¹³åºè§åç»") || user.getDeptName().equals("æ ¸ä»·ç»")) { if (permission.equals("allopen")) { //æéå ¨é¨å¼æ¾ return null; } } //è¿åé»è®¤éæ©æ¹æ¡ return getUserRoleBelongsToUserId(); } } src/main/java/com/zy/crm/manager/mapper/CstmrMapper.java
@@ -21,4 +21,6 @@ int updateDeptIdByUserId(@Param("userId")Long userId, @Param("deptId")Long deptId); Cstmr selectByName(@Param("hostId") Long hostId, @Param("name") String name); } src/main/java/com/zy/crm/manager/service/CstmrService.java
@@ -14,4 +14,6 @@ int updateDeptIdByUserId(Long userId, Long deptId); Cstmr selectByName(Long hostId, String name); } src/main/java/com/zy/crm/manager/service/impl/CstmrServiceImpl.java
@@ -63,4 +63,8 @@ } } @Override public Cstmr selectByName(Long hostId, String name) { return this.baseMapper.selectByName(hostId, name); } } src/main/java/com/zy/crm/system/entity/User.java
@@ -217,6 +217,15 @@ return null; } public String getRoleCode(){ RoleService service = SpringUtils.getBean(RoleService.class); Role role = service.selectById(this.roleId); if (!Cools.isEmpty(role)){ return role.getCode(); } return null; } public void setRoleId(Long roleId) { this.roleId = roleId; } src/main/resources/application.yml
@@ -3,15 +3,22 @@ servlet: context-path: # context-path: /@pom.build.finalName@ compression: enabled: true min-response-size: 1024 mime-types: text/plain tomcat: max-connections: 30000 connection-timeout: 100000 spring: application: name: @pom.build.finalName@ datasource: driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver url: jdbc:sqlserver://47.97.1.152:51433;databasename=zy_crm url: jdbc:sqlserver://192.168.4.15:1433;databasename=zy_crm username: sa password: Zoneyung@zy56$ password: sa@123 # url: jdbc:sqlserver://localhost:1433;databasename=zy_crm # username: sa # password: sa@123 src/main/resources/mapper/CstmrMapper.xml
@@ -113,4 +113,13 @@ update man_cstmr set dept_id = #{deptId} where user_id = #{userId} </update> <select id="selectByName" resultMap="BaseResultMap"> select * from man_cstmr where 1=1 and name = #{name} <if test="hostId != null"> and host_id = #{hostId} </if> </select> </mapper> src/main/webapp/mould/¼×·½µ¥Î»µ¼ÈëÄ£°å.xlsBinary files differ
src/main/webapp/static/js/cool.js
@@ -64,7 +64,7 @@ /** * æç´¢èªå¨è¡¥å ¨ -- select */ function confirmed(val){ function confirmed(val,action= null){ var inputDom = $("input[data-key="+val.substring(0,val.length - 6)+"]"); var selectDom = $("select[data-key="+val+"]"); @@ -87,6 +87,9 @@ } else { cacd.val(selectOptionDom.html()); realDom.val(selectOptionDom.attr("title")); if (action) { action(selectOptionDom.attr("title")); } } inputDom.val(""); }