对归属部门需求进行修改，显示工程一部-河北团队，不显示五部

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralCostProjectRecordsController.java

@@ -217,6 +217,11 @@ public class RuralCostProjectRecordsController extends BaseController {
 	public String form(RuralProjectRecords projectRecords, Model model) {
 		if (projectRecords!=null&&StringUtils.isNotBlank(projectRecords.getId())) {
 			projectRecords = projectRecordsService.get(projectRecords.getId());
+
+			//根据归属部门Id查询归属部门名称显示
+			String belongingDepartmentName = projectRecordsService.getBelongingDepartmentNameByBelongingDepartment(projectRecords.getBelongingDepartment());
+			model.addAttribute("belongingDepartmentName",belongingDepartmentName);
+
             projectRecordsService.queryProjectDetail(projectRecords);
 			//获取工程类型
 			ProjectEngineeringInfo engineeringInfos=engineeringService.get(projectRecords.getEngineeringType());
@@ -258,8 +263,15 @@ public class RuralCostProjectRecordsController extends BaseController {
 			projectRecords.setCreateReportFlag(true);
 			model.addAttribute("projectStartDate", "");
 			model.addAttribute("projectEndDate", "");
+			String belongingDepartmentName = UserUtils.getUser().getOffice().toString();
+			String belongingDepartmentParentId = UserUtils.getUser().getOffice().getParentId();
+			//如果父级id为工程五部则不予显示
+			if(!belongingDepartmentParentId.equals("ee4e055e2f074aef934d283880983a38")){
+				model.addAttribute("belongingDepartmentName",belongingDepartmentName);
+			}
         }
 
+
 		model.addAttribute("ruralProjectRecords", projectRecords);
 		return "modules/ruralprojectrecords/cost/ruralCostProjectRecordsForm";
 	}

src/main/java/com/jeeplus/modules/sys/dao/OfficeDao.java

@@ -98,7 +98,7 @@ public interface OfficeDao extends TreeDao<Office> {
 
 
 	/**
-	 * 查询工程一部-五部及其附属的部门信息
+	 * 查询工程一部-河北团队的信息
 	 * @param office
 	 * @return
 	 */

src/main/resources/mappings/modules/sys/OfficeDao.xml

@@ -774,9 +774,8 @@
 		<include refid="officeColumns"/>
 		FROM sys_office a
 		<include refid="officeJoins"/>
-		WHERE a.del_flag = #{DEL_FLAG_NORMAL} AND a.useable = '1' AND (a.code LIKE
-		<if test="dbName == 'mysql'">concat('%','01100','%')</if>
-		OR a.id = #{id} or a.code between 10001008 and 10001012)
+		WHERE a.del_flag = #{DEL_FLAG_NORMAL} AND a.useable = '1' AND (
+		a.id = #{id} or a.code between 10001008 and 10001014 and a.code != 10001012)
 		<if test="oldName != null and oldName != ''">
 			and a.name like concat('%',#{oldName},'%')
 		</if>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsForm.jsp

@@ -77,6 +77,11 @@
                         return false;
                     }
                 }
+                var belongingDepartment = $("#belongingDepartment").val();
+                if(belongingDepartment == ''|| belongingDepartment == null){
+                    parent.layer.msg("归属部门未填写!", {icon: 5});
+                    return false;
+                }
                 if(i==2){
                     $("#inputForm").attr("action","${ctx}/ruralProject/ruralCostProjectRecords/tstore");
                 }else{
@@ -90,6 +95,11 @@
                         parent.layer.msg("送审规模未填写!", {icon: 5});
                         return false;
                     }
+                    var belongingDepartment = $("#belongingDepartment").val();
+                    if(belongingDepartment == ''|| belongingDepartment == null){
+                        parent.layer.msg("归属部门未填写!", {icon: 5});
+                        return false;
+                    }
                     var submitMoney=$('input:radio[name="submitMoney"]:checked').val();
                     if (null == submitMoney){
                         parent.layer.msg("项目等级未填写!", {icon: 5});
@@ -1063,7 +1073,7 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label">归属部门：</label>
+                    <label class="layui-form-label"><span class="require-item">*</span>归属部门：</label>
                     <div class="layui-input-block  with-icon">
                         <sys:treeselectbelongingDepartment id="belongingDepartment" name="belongingDepartment" value="${ruralProjectRecords.belongingDepartment}" labelName="belongingDepartmentName" labelValue="${belongingDepartmentName}"
                                                     cssStyle="background-color:#fff" title="归属部门" url="/sys/office/treeDataAllByBelongingDepartment?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>