Explorar el Código

财务排序修改

Signed-off-by: anderx <312518615@qq.com>
anderx hace 5 años
padre
commit
daf40c9770

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

@@ -291,15 +291,17 @@
 				select
 					id,
 					name,
+					show_order,
 					url
 				from
 					permission
-				where type = 0
+				where type = 0	 
 			</when>
 			<otherwise>
 				select
 					d.id,
 					d.name,
+					show_order,
 					d.url
 				from
 					user_role a left join role b on
@@ -309,6 +311,7 @@
 				where d.type = 0 and a.uid = #{aid,jdbcType=VARCHAR}
 			</otherwise>
 		</choose>
+		order by show_order
   </select>
   <select id="selectMenuList" parameterType="java.lang.String" resultType="com.goafanti.permission.bo.SubMenu">
   		<choose>
@@ -339,6 +342,7 @@
 					and a.uid = #{aid,jdbcType=VARCHAR}
   			</otherwise>
   		</choose>
+  		order by show_order
   </select>
   <select id="selectTopNavBySubUrl" resultType="java.lang.String" parameterType="java.lang.String">
   	select super_id  from permission where id = (select super_id from permission where url = #{subUrl,jdbcType=VARCHAR})

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

@@ -825,7 +825,7 @@
 	date_format(a.promotion_time,'%Y-%m-%d')promotionTimes,date_format(a.birthday,'%Y-%m-%d')birthdays,
 	a.entry_time entryTime, a.sex,a.son,a.girl,a.political_outlook politicalOutlook,d.education,
 	d.school,d.major,d.title,pm.promotion_remarks promotionRemarks,a.mobile,a.fixed_tel fixedTel,
-	date_format(pm.promotion_time,'%Y-%m-%d') promotionTime,a.id_card idCard,a.birthday,
+	date_format(pm.promotion_time,'%Y-%m-%d') promotionTime,a.id_card idCard,a.birthday,a.employee_id employeeId,
 	date_format(pm.contract_start_time, '%Y-%m-%d') contractStart,date_format(pm.contract_end_time,'%Y-%m-%d')contractEnd,
 	a.certification_authority certificationAuthority, a.residence_province residenceProvince,
 	a.residence_city residenceCity,a.residence_area residenceArea, a.residence_address residenceAddress,

+ 2 - 2
src/main/java/com/goafanti/permission/service/impl/PermissionServiceImpl.java

@@ -292,9 +292,9 @@ public class PermissionServiceImpl extends BaseMybatisDao<PermissionMapper> impl
 	public boolean checkName(String name) {
 		String str=permissionMapper.selectIdByName(name);
 		if (org.apache.commons.lang3.StringUtils.isNotBlank(str)) {
-			return false;
+			return true;
 		}
-		return true;
+		return false;
 	}
 
 }

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

@@ -1,13 +1,13 @@
 #Driver
 jdbc.driverClassName=com.mysql.jdbc.Driver
 #本地
-#jdbc.url=jdbc\:mysql\://localhost\:3306/aft?useUnicode\=true&characterEncoding\=UTF-8&autoReconnect\=true&useSSL\=false
-#jdbc.username=dev
-#jdbc.password=123456
+jdbc.url=jdbc\:mysql\://localhost\:3306/aft?useUnicode\=true&characterEncoding\=UTF-8&autoReconnect\=true&useSSL\=false
+jdbc.username=dev
+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.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+#jdbc.username=root
+#jdbc.password=aftdev
 #\u68c0\u6d4b\u6570\u636e\u5e93\u94fe\u63a5\u662f\u5426\u6709\u6548\uff0c\u5fc5\u987b\u914d\u7f6e
 jdbc.validationQuery=SELECT 'x'
 #\u521d\u59cb\u8fde\u63a5\u6570