Browse Source

登陆大小写,权限,PBS结构树绑合同

wj 4 years ago
parent
commit
57421e3f97

+ 1 - 0
base-service/src/main/java/com/tofly/base/controller/UserController.java

@@ -802,6 +802,7 @@ public class UserController {
         log.info("base:通过用户名从数据库找信息..:"+username);
 //        User sysUser=userService.getOne(Wrappers.<User>lambdaQuery()
 //                .eq(User::getUsername,username));
+        username=username.toUpperCase();
         User sysUser=userService.getUserByName(username);
         if(sysUser==null){
             return ResultRespone.failed("用户信息为空"+username);

+ 1 - 1
sxgk/src/main/java/com/tofly/sxgk/custom/controller/CustomStructureController.java

@@ -140,7 +140,7 @@ public class CustomStructureController {
                 Collectors.summingInt(m -> ((BigDecimal) m.get("cunt")).intValue())));
         list.forEach(userprj -> {
             List<Map<String, Object>> list2 = structuredetailService.listMaps(Wrappers.<Structuredetail>query()
-                    .select("id", "name", "code", "pid","(select level_name\n" +
+                    .select("id", "name", "code", "pid","con_contract","des_contract","(select level_name\n" +
                             "          from tf_ywpn_pbslevel_w\n" +
                             "         where id = tf_ywpn_structuredetail_w.pbslevel_id) as levelName")
                     .exists("select 1\n" +

+ 1 - 1
tofly-auth/src/main/java/com/tofly/auth/oauth/ToflyAuthenticationProvider.java

@@ -262,7 +262,7 @@ public class ToflyAuthenticationProvider implements AuthenticationProvider {
             throw new UsernameNotFoundException("账号或密码出现异常,错误代码2");
         }
 
-        List<String> collect = data.stream().filter(m -> ((String) m.get("SECURITY_CODE")).startsWith("TF_"))
+        List<String> collect = data.stream().filter(m -> ((String) m.get("SECURITY_CODE")).startsWith("GB-TY"))
                 .map(m->(String) m.get("SECURITY_CODE"))
                 .collect(Collectors.toList());