Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0.git into developer

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffApiServiceImpl.java

@@ -355,12 +355,6 @@ public class StaffApiServiceImpl implements StaffApiService {
 			staff.setNickName((user.getAlias()));
 		}
 		String phoneNumber = user.getMobile();
-		if(StringUtils.isBlank(phoneNumber)){
-			logger.info("手机号为空:{}:{}",userId,phoneNumber);
-			res.setMessage("手机号为空");
-			res.setCode(3);
-			return res;
-		}
 		String[] arr = getNationCodeAndPhoneNumber(phoneNumber);
 		staff.setPhoneNumber(arr[1]);
 		staff.setNationCode(arr[0]);
@@ -384,6 +378,11 @@ public class StaffApiServiceImpl implements StaffApiService {
 	
 	private String[] getNationCodeAndPhoneNumber(String phoneNumber){
 		String[] arr = new String[2];
+		if(StringUtils.isBlank(phoneNumber)){
+			arr[0] = "";
+			arr[1] = "";
+			return arr;
+		}
 		arr[0] = "86";
 		arr[1] = phoneNumber;
 		if(phoneNumber.startsWith("853")){

haoban-manage3-service/src/main/resources/mapper/DepartmentMapper.xml

@@ -209,7 +209,7 @@
         enterprise_id = #{enterpriseId,jdbcType=VARCHAR},
       </if>
       <if test="sort != null" >
-        sort = #{sort,jdbcType=INTEGER},
+        sort = #{sort},
       </if>
       <if test="level != null" >
         level = #{level,jdbcType=INTEGER},
@@ -534,6 +534,7 @@
     <include refid="Base_Column_List_short" />
     from tab_haoban_department
     where  wx_enterprise_id = #{wxEnterpriseId} and status_flag = 1
+    order by sort desc
   </select>
 
   <select id="searchDepartment" resultMap="BaseResultMap"  >
@@ -542,5 +543,6 @@
     from tab_haoban_department
     where  wx_enterprise_id = #{wxEnterpriseId} and status_flag = 1
     and department_name likelike CONCAT('%',#{search},'%')
+
   </select>
 </mapper>
\ No newline at end of file