diff --git a/sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java b/sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java
index 5f85287c..b2b0e9d9 100644
--- a/sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java
+++ b/sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java
@@ -58,9 +58,9 @@ public class TokenController {
     //web端登录
     @PostMapping("login")
     public R<?> login(@RequestBody LoginBody form) throws Exception {
-        String decryptedData = RsaUtil.decryptByPrivateKey(form.getPassword(), privateKey);
+//        String decryptedData = RsaUtil.decryptByPrivateKey(form.getPassword(), privateKey);
         // 用户登录
-        LoginUser userInfo = sysLoginService.login(form.getUsername(), decryptedData);
+        LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getPassword());
         String uuid = form.getUuid();
         String captcha = redisService.getCacheObject(CacheConstants.CAPTCHA_CODE_KEY + uuid).toString();
         if (StringUtils.isBlank(captcha)) {
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java
index c0895487..dcd09522 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java
@@ -442,11 +442,8 @@ public class TmTaskServiceImpl implements TmTaskService {
         List<TmTask> tmTaskList;
         if (roles.contains(STRING_ADMIN)) {
             tmTaskList = tmTaskMapper.getAuditListByLeaseTmTask(record);
-        } else if (deptId == 101) {
-            record.setCompanyId(101);
-            tmTaskList = tmTaskMapper.getAuditListByLeaseTmTaskByPeople(record);
-        } else if (deptId == 102) {
-            record.setCompanyId(102);
+        } else if (deptId != null) {
+            record.setCompanyId(deptId.intValue());
             tmTaskList = tmTaskMapper.getAuditListByLeaseTmTaskByPeople(record);
         } else {
             String username = SecurityUtils.getLoginUser().getUsername();
@@ -619,12 +616,18 @@ public class TmTaskServiceImpl implements TmTaskService {
         Set<String> roles = SecurityUtils.getLoginUser().getRoles();
         Long deptId = SecurityUtils.getLoginUser().getSysUser().getDeptId();
         List<TmTask> tmTaskList = new ArrayList<>();
-        if (roles.contains("fgs") && roles.contains("sgb")) {
+        if (roles.contains("admin")) {
+            tmTaskList = tmTaskMapper.getAuditManageListByLeaseTmTask(record);
+        } else if (roles.contains("fgs") && roles.contains("sgb")) {
             record.setCompanyId(101);
             tmTaskList = tmTaskMapper.getAuditManageListByLeaseTmTask(record);
-        } else if (roles.contains("fgs")) {
+        } else if (roles.contains("fgs") && (roles.contains("em01") || roles.contains("em02"))) {  //机具书记/副经理内部审批权限
+            record.setCompanyId(101);
+            tmTaskList = tmTaskMapper.getAuditManageListByLeaseTmTask(record);
+        } else if (roles.contains("fgs")){
             record.setDeptId(deptId);
             tmTaskList = tmTaskMapper.getAuditManageListByLeaseTmTask(record);
+
         }
         Long companyId = SecurityUtils.getLoginUser().getSysUser().getCompanyId();
         for (TmTask tmTask : tmTaskList) {