优化登录逻辑。

src/main/java/thyyxxk/webserver/dao/his/LoginDao.java

@@ -19,8 +19,8 @@ public interface LoginDao {
     UserInfo findUserByCodeRsFromDjUserBase(@Param("codeRs") String codeRs);
 
     @Select("select code, name, code_rs, password='123456' " +
-            "from a_employee_mi where code_rs=#{codeRs} and del_flag=0")
-    UserInfo findUserByCodeRsFromAEmployeeMi(@Param("codeRs") String codeRs);
+            "from a_employee_mi where code_rs=#{codeRs} and isnull(del_flag,0)!=1")
+    UserInfo findUserByCodeRsFromEmployeeMi(@Param("codeRs") String codeRs);
 
     @Insert("insert into dj_user_base (code, code_rs, name, password, del_flag) " +
             "values (#{code}, #{codeRs}, #{name}, '123456', 0)")
@@ -64,10 +64,6 @@ public interface LoginDao {
             "</script>")
     List<String> getParentPaths(@Param("paths") List<String> paths);
 
-
-    @Select("select * from dj_dict_menu where parent=#{parent}")
-    List<MenuItem> selectMenusByParent(@Param("parent") Integer parent);
-
     @Select("<script>" +
             "select * from dj_dict_menu where code in " +
             "(select menu_code from dj_role_menu where role_id in " +

src/main/java/thyyxxk/webserver/service/LoginService.java

@@ -35,8 +35,10 @@ public class LoginService {
 
     public ResultVo<UserInfo> login(UserInfo userInfo) {
         UserInfo tempUserInfo = dao.findUserByCodeRsFromDjUserBase(userInfo.getCodeRs());
+        log.info("tempUser: {}", tempUserInfo);
         if (null == tempUserInfo) {
-            tempUserInfo = dao.findUserByCodeRsFromAEmployeeMi(userInfo.getCodeRs());
+            tempUserInfo = dao.findUserByCodeRsFromEmployeeMi(userInfo.getCodeRs());
+            log.info("tempUser: {}", tempUserInfo);
             if (null == tempUserInfo) {
                 return ResultVoUtil.fail(ExceptionEnum.USER_NOT_EXIST);
             }
@@ -69,6 +71,9 @@ public class LoginService {
     public ResultVo<List<MenuItem>> fetchMenus() {
         Map<Integer, MenuItem> finalMap = new HashMap<>(Capacity.DEFAULT);
         List<Integer> roles = dao.getUserRoles(TokenUtil.getTokenUserId());
+        if (null == roles || roles.isEmpty()) {
+            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "请联系管理员为您分配角色权限。");
+        }
         List<MenuItem> userMenus = dao.selectMenusByRoles(roles);
         List<MenuItem> doubleLevelMenus = new ArrayList<>();
         List<MenuItem> tripleLevelMenus = new ArrayList<>();