Browse Source

部门新增字段显示标识

anderx 3 years ago
parent
commit
1d1a5d00a1

+ 1 - 1
src/main/java/com/goafanti/common/mapper/DepartmentMapper.xml

@@ -344,7 +344,7 @@
   <select id="selectAllById" resultType="com.goafanti.organization.bo.OrganizationListOut">
     select a.id, a.create_id as createId, a.create_time as createTime, a.update_time as updateTime,
            a.deleted_sign as deletedSign, a.name, a.type, a.manager_id as managerId, a.dep_no as depNo,
-           a.super_id as superId, a.remarks, a.status, a.abbreviation, a.finance_id financeId,
+           a.super_id as superId, a.remarks, a.status, a.abbreviation, a.finance_id financeId,a.hide_sign hideSign,
            a.province, c.name financeName, a.working_hours_type workingHoursType, b.name as managerName
     from department a
            left join admin b on a.manager_id = b.id left join admin c on a.finance_id = c.id

+ 1 - 1
src/main/java/com/goafanti/organization/controller/AdminOrganizationController.java

@@ -97,7 +97,7 @@ public class AdminOrganizationController extends BaseApiController{
 		String sdepNo=departmentMapper.selectDepNo(superId);//No
 		int count=departmentMapper.selectDepNoCount(superId);//14
 		if((count+1)>99){
-			res.getError().add(buildError("","每层最多存在99个子类"));
+			res.getError().add(buildError("每层最多存在99个子类"));
 			return res;
 		}
 		int i=organizationService.updateOrganization(name, type, managerId, superId, status, province,remarks,id,

+ 5 - 5
src/main/resources/props/config_local.properties

@@ -1,12 +1,12 @@
 dev.name=local
 jdbc.driverClassName=com.mysql.jdbc.Driver
-jdbc.url=jdbc\:mysql://localhost:3306/aft20220318?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+#jdbc.url=jdbc\:mysql://localhost:3306/aft20220318?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
 #jdbc.url=jdbc\:mysql://localhost:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
-jdbc.username=root
-jdbc.password=123456
-#jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
 #jdbc.username=root
-#jdbc.password=aftdev
+#jdbc.password=123456
+jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+jdbc.username=root
+jdbc.password=aftdev
 jdbc.validationQuery=SELECT 'x'
 jdbc.initialSize=3
 jdbc.maxActive=20