Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/sys/web/OfficeController.java

@@ -212,11 +212,14 @@ public class OfficeController extends BaseController {
             addMessage(redirectAttributes, "演示模式，不允许操作！");
             return "redirect:" + adminPath + "/sys/office/";
         }
-        Office o=officeService.get(office.getParent().getId());
-        if(o.getType().equals("2")){
-            if(!"2".equals(office.getType())){
-                addMessage(redirectAttributes, "部门下不能添加分公司！");
-                return "redirect:" + adminPath + "/sys/office/";
+        Office office1 = office.getParent();
+        if(office1 != null && office1.getName() != null) {
+            Office o = officeService.get(office.getParent().getId());
+            if (o.getType().equals("2")) {
+                if (!"2".equals(office.getType())) {
+                    addMessage(redirectAttributes, "部门下不能添加分公司！");
+                    return "redirect:" + adminPath + "/sys/office/";
+                }
             }
         }
         if (!beanValidator(model, office)) {

src/main/java/com/jeeplus/modules/workregularapply/service/WorkRegularApplyService.java

@@ -228,6 +228,8 @@ public class WorkRegularApplyService extends CrudService<WorkRegularApplyDao, Wo
 			String titleStr = "转正人:"+user.getName();
             List<User> zzr=new ArrayList<>();
 			zzr.add(user);
+			variables.put("zzrCount",zzr.size());
+			variables.put("zzrList",zzr);
 			String businessKey = workRegularApply.getId();
 			Office applyOffice = officeDao.get(user.getOffice().getId());
 			WorkActivityMenu workActivityMenu = workActivityMenuService.findByParentAndOffice("zzsql3125f1f194c82bdea9mrlcc750904", applyOffice);
@@ -460,7 +462,7 @@ public class WorkRegularApplyService extends CrudService<WorkRegularApplyDao, Wo
 					workActivityProcess.setId("");
 				}
 				// 审核环节
-				if ("zzr".equals(taskDefKey) && count.contains("1")) {
+				if ("zzr".equals(taskDefKey)) {
 					taskCount = "1";
 					exp = "pass";
 					if ("yes".equals(flag)) {