`fix 商户&自动排班`

ruoyi-admin/src/main/resources/application.yml

@@ -290,8 +290,8 @@ wx:
         msgDataFormat: JSON
   pay:
     appId: wx5c9baacf2aab55b8 #微信公众号或者小程序等的appid (V3商户模式需要)
-    mchId: 1676158154 #微信支付商户号 (V3商户模式需要)
-    mchKey: FP1arPM22zIjZeQUniJO2vMEHxf4KjHh #微信支付商户密钥
+    mchId: 1714850376 #1676158154 #微信支付商户号 (V3商户模式需要)
+    mchKey: BqwOfLa8k67SXuG1ickhd8LdgAXEcl5G #FP1arPM22zIjZeQUniJO2vMEHxf4KjHh #微信支付商户密钥
     keyPath: apiclient_cert.p12 # p12证书的位置，可以指定绝对路径，也可以指定类路径（以classpath:开头）
 
 

ruoyi-admin/src/main/resources/old_apiclient_cert.pem

@@ -0,0 +1,25 @@
+-----BEGIN CERTIFICATE-----
+MIIELjCCAxagAwIBAgIULYljK6v/kXrS57ZwD2pdzdw8C54wDQYJKoZIhvcNAQEL
+BQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsT
+FFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3Qg
+Q0EwHhcNMjUwMjEwMDgyNDI5WhcNMzAwMjA5MDgyNDI5WjCBhzETMBEGA1UEAwwK
+MTY3NjE1ODE1NDEbMBkGA1UECgwS5b6u5L+h5ZWG5oi357O757ufMTMwMQYDVQQL
+DCrlroHlvrfluILlsI/mlbDngrnmlbDmja7np5HmioDmnInpmZDlhazlj7gxCzAJ
+BgNVBAYTAkNOMREwDwYDVQQHDAhTaGVuWmhlbjCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBALJRW2+8eDAFfZF6leDxBBdAjvKq2v+sqKSkOPj4tnIJSFLl
+7jA9mVVUfVJ6YJKEYjrE0rFEG7vVvr3Epw7qt65TCRt18mRMXeZPjQzKp2AZW5H1
+aayaM7iemJ1Ks02tbVvGhkMDac6WA0ZzkvxF58W7oD1lrkCQB8w/3E+uU0KkglCj
+2DF2Hjiz2eKks/8qk5DqhuOG6iDjPG/xPz86T6tDnPZofoQJAyQBcBJu42kx6Peo
+V6nCJasux2P/IyBXiHum9Efv3srk7Z/Wdp5XIPfKoKb+76piEwdap9MUskFdXs/n
+PMKx1zeDb6UtD9ndDrl5OQk3H/leJpIDB7lTCNsCAwEAAaOBuTCBtjAJBgNVHRME
+AjAAMAsGA1UdDwQEAwID+DCBmwYDVR0fBIGTMIGQMIGNoIGKoIGHhoGEaHR0cDov
+L2V2Y2EuaXRydXMuY29tLmNuL3B1YmxpYy9pdHJ1c2NybD9DQT0xQkQ0MjIwRTUw
+REJDMDRCMDZBRDM5NzU0OTg0NkMwMUMzRThFQkQyJnNnPUhBQ0M0NzFCNjU0MjJF
+MTJCMjdBOUQzM0E4N0FEMUNERjU5MjZFMTQwMzcxMA0GCSqGSIb3DQEBCwUAA4IB
+AQBBMfwjbIT6JnCsg58ik/+n9kyrm6ZI5dXcXmq1dSj7jw5LlAtBRE//vPYEGU28
++bJ0JwXjuYdVdXm2Lci1EI7XsCg2bg/jZqakSwLTS2KcDCdweYRFQH9oJxcrxQBJ
+tmUyv9iue5bD9GMUW90csRglsWyJp4+M9U14quldzaQlzWJz+zRmKRyMxXXgk8sO
+p5oPDhMNW8pdKcmgr8p5f0zqTL6ZFKl9T3/3RRubw+qum0PZMqKw7NnEneEogYm9
+q2wrsVPSMKunMz0mRkK+kPr9FXPzzQLe7X5aOpDR9+Z1SD3lQ09ejWGhZ4KPzlc4
+uMit4S3vsxLJ9AZmpUpon/2I
+-----END CERTIFICATE-----

ruoyi-admin/src/main/resources/old_apiclient_key.pem

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCyUVtvvHgwBX2R
+epXg8QQXQI7yqtr/rKikpDj4+LZyCUhS5e4wPZlVVH1SemCShGI6xNKxRBu71b69
+xKcO6reuUwkbdfJkTF3mT40MyqdgGVuR9WmsmjO4npidSrNNrW1bxoZDA2nOlgNG
+c5L8RefFu6A9Za5AkAfMP9xPrlNCpIJQo9gxdh44s9nipLP/KpOQ6objhuog4zxv
+8T8/Ok+rQ5z2aH6ECQMkAXASbuNpMej3qFepwiWrLsdj/yMgV4h7pvRH797K5O2f
+1naeVyD3yqCm/u+qYhMHWqfTFLJBXV7P5zzCsdc3g2+lLQ/Z3Q65eTkJNx/5XiaS
+Awe5UwjbAgMBAAECggEAXRFDVN0cKYwkDnLZmO6SAQTL1vG/nWPjHRMtPRyqNHiN
+y95/46OyzKttQUfn8XCwyBWEFcsDYpTbmbXyr0FoHs7t2OxFV33YIGVyq7N1ih2S
+AmsA/Xn59qin5KhhTvBuPFEwL/evGIiJKxMVKx/dKQGVT5YrTT0fJMZL2TaV9BiC
+e9hIbPFpP8L68otE0A38yfHKniO/5Jew1MRo8QDKaJS5b3cF5IL0Ld0WEjnLhi5O
+lfY5UQdofNAUYqaJEvj3gCYeDHihx1Heb1HzDjsBzZey+E7x0tju59sW4FC1Eahk
+bLk5DXq5pYBnODBKuKLHUY0HTv+MwEPMYcQSlIJtqQKBgQDquQku2+L8ruRGkStT
+zamR3IWFR8NCnE5Oq9vSVceRozrCMSUOfQJcw4smH4QtZTqC5oMLHI6Lb5DDY6Kc
+zK8OzgUhQyCnFHdzLQ80ILREIt7qbBcS/JYL4Zb3kwA/OJAg2UWP75vDHY+Si4y3
+ajC+4kQoUILTQ6pXyyMUpi1ozQKBgQDCe2Pf3POjsj0+sIP0s56nMLJcElAHhhTr
+/wkdsAnLaRb+BSdBsC/cVwHmtmCgtyQ3Yq5RupLIpCshXyxGjKSltRqzln5TWjlQ
+jrEeT3Upz4NqApRhnchNdsY8MimHmx+g4eFYeK1/6Stt2WhIBhLU+89x2jR8IbBj
+2iS4U4bYRwKBgCquXOIdb8f80VuXmCZT9mqki87xfqsFGyQpEf7MRE7SPKQFJbTd
+vGk70XisMG/EwX/+BIQnvC/UqKEu4+nZOlfZ1Ir41t4q1ZGm9uXGsKDXKmu8HfIA
+5hPhAH+iRmA4m9StTX3f1xYCsRG3uG29rIF5SWV/Rlq+KiJuuMFPemBdAoGAXaJM
+rp5RizGofQM9NNY5/2LZrKyAbW7nqcvLVsjHnnCFSl2uzdiG4n3dg3exRA+I10Wi
+ieTbANDRlyqcRYc3SjTMm0RMo9Lfn2Jj8iTtUuj+6048pFbz9h/GR3sbNZfA/ZNj
+DFZlqhzX9PZkV7Dc5kAqWzVkaZNKunhvj3Nfi8cCgYEA6dNDR27uafNCrQOBIgbi
+Rue+ixcUQFNQswZRUpnpE7itF8/PhbQHDnFE4oQptm7kzpTELxwVxHLQ7aUEZWB7
+uug9m9hHA6aKNkjP7sghnJsK3cu5FR137wN43b/wcY40Yi4usEiA/gIGA1VBr1XU
+TFCDIzRldcB1ZwYlYE813pE=
+-----END PRIVATE KEY-----

ruoyi-modules/ruoyi-khy/src/main/java/org/dromara/util/CabinetUtil.java

@@ -110,7 +110,7 @@ public class CabinetUtil {
                 List<SysUserVo> userlist =  SpringUtils.getBean(ISysUserService.class).getUserList(sysUserBo);
                 log.info(String.valueOf(userlist.size()));
                 for(SysUserVo vo:userlist){
-                    if(!vo.getPhonenumber().isEmpty() && vo.getPhonenumber() != null){
+                    if(vo!=null && vo.getPhonenumber()!=null && !vo.getPhonenumber().isEmpty() && vo.getPhonenumber() != null){
                         log.info("----------------------快递员{}开始同步----------------------",vo.getNickName());
                         try{
                             String month = getLastMonth();

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java

@@ -94,10 +94,10 @@ public interface SysUserMapper extends BaseMapperPlus<SysUser, SysUserVo> {
      * @param userId 用户ID
      * @return 用户对象信息
      */
-    @DataPermission({
-        @DataColumn(key = "deptName", value = "d.dept_id"),
-        @DataColumn(key = "userName", value = "u.user_id")
-    })
+//    @DataPermission({
+//        @DataColumn(key = "deptName", value = "d.dept_id"),
+//        @DataColumn(key = "userName", value = "u.user_id")
+//    })
     SysUserVo selectUserById(Long userId);
 
     @Override