Merge remote-tracking branch 'origin/dev' into dev

applications/document/document-server/src/main/resources/mapper/ProductMapper.xml

@@ -445,7 +445,7 @@
         <result column="pw_amount" property="rc_amount" jdbcType="DOUBLE" />
     </resultMap>
     <select id="selectReserveCost" resultMap="ProdReserveCostResultMap">
-        select * from productWH tab left join Product on pw_prodid=pr_id left join warehouse on pw_whid=wh_id
+        select * from productWH tab left join Product on pw_prodcode=pr_code left join warehouse on pw_whid=wh_id
         <where>
           <if test="con!=null">
               ${con}

applications/purchase/purchase-server/src/main/resources/mapper/ProdInOutListMapper.xml

@@ -115,7 +115,7 @@
 
   <select id="selectProdInOutListByCondition"  resultMap="BaseResultMap">
     select  *  from prodinout left join prodiodetail on pi_id = pd_piid left join vendor on pi_vendid=ve_id
-    left join product on pd_prodcode=pr_code
+    left join product on pd_prodid=pr_id
     <where>
       <if test="con != null">
         ${con}

applications/storage/storage-server/src/main/resources/mapper/ProdInOutListMapper.xml

@@ -103,7 +103,7 @@
 
   <select id="selectProdInOutListByCondition"  resultMap="BaseResultMap">
     select  *  from prodinout left join prodiodetail on pi_id = pd_piid
-    left join product on pd_prodcode=pr_code
+    left join product on pd_prodid=pr_id
     <where>
       <if test="con != null">
         ${con}

base-servers/account/account-server/src/main/java/com/usoftchina/saas/account/controller/AccountController.java

@@ -413,6 +413,10 @@ public class AccountController {
     @PostMapping("/enable")
     public Result enableAccount(@RequestParam long accountId) {
         accountService.enable(accountId);
+        //同步到优软云
+        Long userUU = accountService.findByPrimaryKey(accountId).getUu();
+        Long companyUU = companyService.findByPrimaryKey(BaseContextHolder.getCompanyId()).getUu();
+        String result = ssoUserApi.bind("bind", "trade-app", userUU, companyUU);
         accountService.clearCache(accountId);
         return Result.success();
     }

base-servers/auth/sso-api/src/main/java/com/usoftchina/sso/api/SsoUserApi.java

@@ -60,6 +60,9 @@ public interface SsoUserApi {
     @PostMapping("")
     String unbind(@RequestParam("_operate") String _operate, @RequestParam("userUU") Long userUU, @RequestParam("spaceUU") Long spaceUU);
 
+    @PostMapping("")
+    String bind(@RequestParam("_operate") String _operate, @RequestParam("appId") String appId, @RequestParam("userUU") Long userUU, @RequestParam("spaceUU") Long spaceUU);
+
     @Component
     class DefaultFallback implements SsoUserApi{
         @Override
@@ -82,5 +85,10 @@ public interface SsoUserApi {
             return null;
         }
 
+        @Override
+        public String bind(String _operate, String appId, Long userUU, Long spaceUU) {
+            return null;
+        }
+
     }
 }