Enford 5 éve
szülő
commit
a47552adc2

+ 10 - 0
src/main/java/com/jeeplus/modules/projectplanweekly/entity/ProjectPlanWeekly.java

@@ -20,6 +20,16 @@ public class ProjectPlanWeekly extends DataEntity<ProjectPlanWeekly> {
     private String officeId;
     private String companyId;
 
+    private String btnAgent;//按钮控制
+
+    public String getBtnAgent() {
+        return btnAgent;
+    }
+
+    public void setBtnAgent(String btnAgent) {
+        this.btnAgent = btnAgent;
+    }
+
     public String getOfficeId() {
         return officeId;
     }

+ 22 - 5
src/main/java/com/jeeplus/modules/projectplanweekly/web/ProjectPlanWeeklyController.java

@@ -7,6 +7,7 @@ import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.common.web.BaseController;
 import com.jeeplus.modules.projectplanweekly.entity.ProjectPlanWeekly;
 import com.jeeplus.modules.projectplanweekly.service.ProjectPlanWeeklyService;
+import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -52,7 +53,7 @@ public class ProjectPlanWeeklyController extends BaseController {
             projectPlanWeekly.setEndDate(sundayDate);
         }
         Page<ProjectPlanWeekly> page = projectPlanWeeklyService.findPageWeekly(new Page<ProjectPlanWeekly>(request,response),projectPlanWeekly);
-        List<ProjectPlanWeekly> list = page.getList();
+        getBtnAgent(page.getList());
         model.addAttribute("page", page);
         return "modules/projectplanweekly/projectPlanWeeklyList";
     }
@@ -81,13 +82,15 @@ public class ProjectPlanWeeklyController extends BaseController {
     public String view(ProjectPlanWeekly projectPlanWeekly, HttpServletRequest request,Model model){
         if (null!=projectPlanWeekly&&!projectPlanWeekly.getProjectId().equals("")){
             ProjectPlanWeekly planWeekly = projectPlanWeeklyService.getPlanWeekly(projectPlanWeekly.getId());
-            planWeekly.setUser(UserUtils.getUser());
-            planWeekly.setOffice(UserUtils.getUser().getOffice());
+            User byUserId = UserUtils.getByUserId(planWeekly.getCreateBy().getId());
+            planWeekly.setUser(byUserId);
+            planWeekly.setOffice(byUserId.getOffice());
             model.addAttribute("projectPlanWeekly", planWeekly);
         }else {
             ProjectPlanWeekly projectPlanWeeklyUpdate = projectPlanWeeklyService.get(projectPlanWeekly.getId());
-            projectPlanWeeklyUpdate.setUser(UserUtils.getUser());
-            projectPlanWeeklyUpdate.setOffice(UserUtils.getUser().getOffice());
+            User byUserId = UserUtils.getByUserId(projectPlanWeeklyUpdate.getCreateBy().getId());
+            projectPlanWeeklyUpdate.setUser(byUserId);
+            projectPlanWeeklyUpdate.setOffice(byUserId.getOffice());
             model.addAttribute("projectPlanWeekly", projectPlanWeeklyUpdate);
         }
         return "modules/projectplanweekly/projectPlanWeeklyView";
@@ -166,4 +169,18 @@ public class ProjectPlanWeeklyController extends BaseController {
         }
         return "redirect:"+ Global.getAdminPath()+"/projectplan/weekly/?repage";
     }
+
+    //设置按钮权限
+    public void getBtnAgent(List<ProjectPlanWeekly> list){
+        String id = UserUtils.getUser().getId();//获取当前登录人id
+        for (ProjectPlanWeekly projectPlanWeekly:list){
+            if (null == projectPlanWeekly.getProjectId() || projectPlanWeekly.getProjectId().equals("")){
+                if (projectPlanWeekly.getCreateBy().getId().equals(id)){
+                    projectPlanWeekly.setBtnAgent("0");
+                }
+            }else {
+                projectPlanWeekly.setBtnAgent("1");
+            }
+        }
+    }
 }