Merge branch 'merge-mazq-bujz-211015' into 'develop'

feature(SQL修改): SQL修改

See merge request dcuc-tjdsj/app-service!73

dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/mapper/ApplyInfoMapper.java

@@ -20,9 +20,9 @@ public interface ApplyInfoMapper extends BaseMybatisMapper<ApplyInfo> {
     /**
      * 根据机构信息更新用户信息
      *
-     * @param orgId   组织ID
+     * @param orgCode 组织Code
      * @param orgName 组织名称
      */
-    void updateOrgInfo(@Param("orgId") String orgId, @Param("orgName") String orgName);
+    void updateOrgInfo(@Param("orgCode") String orgCode, @Param("orgName") String orgName);
 
 }

dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/service/impl/ApplyInfoServiceImpl.java

@@ -356,6 +356,7 @@ public class ApplyInfoServiceImpl extends BaseMybatisService<ApplyInfo, String>
         if(StringUtils.isNotBlank(applyStatus)){
             wrapper.eq(ApplyInfo::getApplyStatus,applyStatus);
         }
+        wrapper.eq(ApplyInfo::getDeleted, BooleanEnum.FALSE.value);
         return applyInfoMapper.selectList(wrapper);
     }
 

dcuc-app-service/src/main/resources/mapping/ApplyInfoMapper.xml

@@ -10,6 +10,6 @@
     <update id="updateOrgInfo">
         update t_apply_info
         set org_name = #{orgName}
-        where org_id = #{orgId}
+        where org_code = #{orgCode}
     </update>
 </mapper>