F

application/src/main/java/com/lyg/application/controller/TaRotationController.java

@@ -113,11 +113,18 @@ public class TaRotationController extends BaseController {
 
         String specificOrgNum = taRotation.getSpecificOrgName();//轮岗前具体单位名称 传来的是orgId
 //        String specificOrgNum = taRotation.getSpecificOrgNum();//轮岗前单位号
-        String specificNameOrgRotation = taRotation.getSpecificNameOrgRotation();//轮岗后具体单位名称
-        String orgNumJobRotation = taRotation.getOrgNumJobRotation();//轮岗后单位号
+        String OrgRotationId = taRotation.getSpecificNameOrgRotation();//轮岗后具体单位名称 传来的是orgId
+//        String orgNumJobRotation = taRotation.getOrgNumJobRotation();//轮岗后单位号
+
         String specificOrgName = sysOrgMapper.getOrgId(specificOrgNum);
-        taRotation.setSpecificOrgNum(specificOrgName);
-        taRotation.setSpecificOrgName();
+        taRotation.setSpecificOrgNum(specificOrgNum);
+        taRotation.setSpecificOrgName(specificOrgName);
+
+        String orgNameJobRotation = sysOrgMapper.getOrgId(OrgRotationId);
+        taRotation.setOrgNumJobRotation(OrgRotationId);
+        taRotation.setSpecificNameOrgRotation(orgNameJobRotation);
+
+
         taRotationService.save(taRotation);
         Object result = rule.taRotationRule(taRotation);
 
@@ -136,6 +143,19 @@ public class TaRotationController extends BaseController {
     @PutMapping("/taRotation/{id}")
     public SaResult edit(@ApiParam("对象实体") @Validated @RequestBody TaRotation taRotation,
                          @ApiParam("对象ID") @PathVariable String id) throws Exception {
+        String specificOrgNum = taRotation.getSpecificOrgName();//轮岗前具体单位名称 传来的是orgId
+//        String specificOrgNum = taRotation.getSpecificOrgNum();//轮岗前单位号
+        String OrgRotationId = taRotation.getSpecificNameOrgRotation();//轮岗后具体单位名称 传来的是orgId
+//        String orgNumJobRotation = taRotation.getOrgNumJobRotation();//轮岗后单位号
+
+        String specificOrgName = sysOrgMapper.getOrgId(specificOrgNum);
+        taRotation.setSpecificOrgNum(specificOrgNum);
+        taRotation.setSpecificOrgName(specificOrgName);
+
+        String orgNameJobRotation = sysOrgMapper.getOrgId(OrgRotationId);
+        taRotation.setOrgNumJobRotation(OrgRotationId);
+        taRotation.setSpecificNameOrgRotation(orgNameJobRotation);
+
         taRotation.setRotationId(id);
         taRotationService.updateById(taRotation);
         Object result = rule.taRotationRule(taRotation);

system/src/main/java/com/lyg/system/controller/BaseController.java

@@ -6,6 +6,7 @@ import com.lyg.common.util.StringUtil;
 import com.lyg.system.entity.SysUser;
 import com.lyg.system.service.SysUserService;
 import com.lyg.system.service.request.Fetch;
+import lombok.SneakyThrows;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -25,6 +26,22 @@ public class BaseController {
     @Resource
     HttpServletRequest request;
 
+    /**
+     * 数据权限校验
+     */
+
+    @SneakyThrows
+    public void checkAuth() {
+        SysUser sysUser = currentUser();
+        Integer isAdmin = sysUser.getIsAdmin();
+        if (isAdmin.equals(1)){
+            //是超级管理员
+        }else{
+//            不是管理员
+        }
+
+    }
+
     /**
      * 获取当前用户
      *