Merge branch 'chenhao' into developer

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/AlertCalledMapper.xml

@@ -126,16 +126,16 @@
             <if test="alertSourceCode!= null ">
                 and alert_source_code = #{alertSourceCode}
             </if>
-            <if test="data != null and lift == 'ascend'">
-                order by #{data} ASC  limit #{current},#{size}
-            </if>
-            <if test="data != null and lift == 'descend'">
-                order by #{data} DESC  limit #{current},#{size}
-            </if>
-            <if test="data == null ">
-                order by call_time DESC  limit #{current},#{size}
-            </if>
         </where>
+        <if test="data != null and lift == 'ascend'">
+            order by #{data} ASC  limit #{current},#{size}
+        </if>
+        <if test="data != null and lift == 'descend'">
+            order by #{data} DESC  limit #{current},#{size}
+        </if>
+        <if test="data == null ">
+            order by call_time DESC  limit #{current},#{size}
+        </if>
     </select>
 
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

@@ -635,6 +635,10 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         OrgUsr oriOrgUsr = getById(id);
         BeanUtils.copyProperties(OrgPersonVo, orgUsr);
         orgUsr.setSequenceNbr(id);
+        /* Bug 2647  编辑用户所属单位后按单位筛选人员结果错误  增加了 638 639 两行代码 根据修改的部门调整部门code 2021-09-03 陈召  开始*/
+            OrgUsr parent = getById(OrgPersonVo.getParentId());
+            orgUsr.setBizOrgCode(parent.getBizOrgCode() + getOrgCodeStr());
+        /* Bug 2647  编辑用户所属单位后按单位筛选人员结果错误  增加了 638 639 两行代码 根据修改的部门调整部门code 2021-09-03 陈召  结束*/
         if (!ObjectUtils.isEmpty(OrgPersonVo.getAmosOrgId())) {
             AgencyUserModel user = Privilege.agencyUserClient.queryByUserId(OrgPersonVo.getAmosOrgId()).getResult();
             oriOrgUsr.setAmosOrgCode(user.getRealName());