|
@@ -11,6 +11,8 @@ import com.jeeplus.common.utils.ThisLocalityDownloadUtil;
|
|
|
import com.jeeplus.common.web.BaseController;
|
|
|
import com.jeeplus.modules.act.entity.Act;
|
|
|
import com.jeeplus.modules.act.service.ActTaskService;
|
|
|
+import com.jeeplus.modules.areaStaff.entity.AreaStaffInfo;
|
|
|
+import com.jeeplus.modules.areaStaff.service.AreaStaffService;
|
|
|
import com.jeeplus.modules.ruralprojectrecords.enums.ProjectStatusEnum;
|
|
|
import com.jeeplus.modules.signature.dailyOfficeWork.entity.DailyOfficeWork;
|
|
|
import com.jeeplus.modules.signatureManagement.electronicSignature.entity.ElectronicSignatureInfo;
|
|
@@ -54,6 +56,8 @@ public class ElectronicSignatureController extends BaseController {
|
|
|
private ActTaskService actTaskService;
|
|
|
@Autowired
|
|
|
protected HistoryService historyService;
|
|
|
+ @Autowired
|
|
|
+ private AreaStaffService areaStaffService;
|
|
|
|
|
|
@ModelAttribute
|
|
|
public ElectronicSignatureInfo get(@RequestParam(required=false) String id) {
|
|
@@ -95,6 +99,17 @@ public class ElectronicSignatureController extends BaseController {
|
|
|
Page<ElectronicSignatureInfo> page = electronicSignatureService.findPage(new Page<ElectronicSignatureInfo>(request, response), electronicSignatureInfo);
|
|
|
List<ElectronicSignatureInfo> list = page.getList();
|
|
|
|
|
|
+ model.addAttribute("masterState", "0");
|
|
|
+
|
|
|
+ //获取当前登录人是否是地区负责人
|
|
|
+ User user = UserUtils.getUser();
|
|
|
+ if(StringUtils.isNotBlank(user.getId())){
|
|
|
+ AreaStaffInfo masterStateByUserId = areaStaffService.getMasterStateByUserId(user.getId());
|
|
|
+ if(null != masterStateByUserId){
|
|
|
+ model.addAttribute("masterState", "1");
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
model.addAttribute("page", page);
|
|
|
return "modules/signatureManagement/electronicSignature/ElectronicSignatureList";
|