fix bug

sop-api/install/mysql/upgrade/1.1.2.sql

@@ -267,4 +267,11 @@ SET code='TEXTAREA', `type`='FORM', form_id='approve_ramark_region', form_name='
 WHERE id=136;
 UPDATE t_d_form_widget
 SET code='TEXTAREA', `type`='FORM', form_id='approve_ramark_project', form_name='approve_ramark_project', title='审批意见', input_type='STRING', required=0, readable=0, writable=1, visable=1, `scale`=NULL, `length`=500, binding=NULL, data_grid=NULL, tips=NULL, format=NULL, span=12, sub_title=NULL, `options`=NULL, flow_type='CLOUD_MARK_SOP_FLOW', form_setup=3, handle=0, form_group=2, role_type='PROJECT_MANAGER', create_id=1, create_time=1
-WHERE id=140;
+WHERE id=140;
+
+UPDATE t_d_form_widget
+SET code='NUMBER', `type`='FORM', form_id='scan_page_count', form_name='scan_page_count', title='扫描张数', input_type='INT', required=1, readable=0, writable=1, visable=1, `scale`=NULL, `length`=NULL, binding=NULL, data_grid=NULL, tips=NULL, format=NULL, span=3, sub_title=NULL, `options`=NULL, flow_type='CLOUD_MARK_SOP_FLOW', form_setup=9, handle=0, form_group=NULL, role_type=NULL, create_id=1, create_time=8
+WHERE id=195;
+UPDATE t_d_form_widget
+SET code='LABEL', `type`='FORM', form_id='scan_page_count_label', form_name='scan_page_count_label', title='[{"label":"操作说明","color":"black"},{"label":"1、待补充","color":"black"},{"label":"2、待补充","color":"black"},{"label":"3、待补充","color":"black"}]', input_type='STRING', required=0, readable=1, writable=0, visable=1, `scale`=NULL, `length`=NULL, binding=NULL, data_grid=NULL, tips=NULL, format=NULL, span=6, sub_title=NULL, `options`=NULL, flow_type='CLOUD_MARK_SOP_FLOW', form_setup=9, handle=0, form_group=NULL, role_type=NULL, create_id=1, create_time=9
+WHERE id=196;

sop-business/src/main/java/com/qmth/sop/business/service/impl/TBSopInfoServiceImpl.java

@@ -1308,13 +1308,13 @@ public class TBSopInfoServiceImpl extends ServiceImpl<TBSopInfoMapper, TBSopInfo
                 if (!CollectionUtils.isEmpty(engineerMap)) {
                     m.put("engineer_users_id_1", stringJoinerEngineer.toString());
                 }
-                if (!CollectionUtils.isEmpty(engineerMap)) {
+                if (!CollectionUtils.isEmpty(regionManagerMap)) {
                     m.put("region_manager_id_1", stringJoinerRegionManager.toString());
                 }
-                if (!CollectionUtils.isEmpty(engineerMap)) {
+                if (!CollectionUtils.isEmpty(projectManagerMap)) {
                     m.put("project_manager_id_1", stringJoinerProjectManager.toString());
                 }
-                if (!CollectionUtils.isEmpty(engineerMap)) {
+                if (!CollectionUtils.isEmpty(regionCoordinatorMap)) {
                     m.put("region_coordinator_id_1", stringJoinerRegionCoordinator.toString());
                 }
             }

sop-business/src/main/resources/db/log/wangliang_update_log.sql

@@ -596,4 +596,11 @@ SET code='TEXTAREA', `type`='FORM', form_id='approve_ramark_region', form_name='
 WHERE id=136;
 UPDATE t_d_form_widget
 SET code='TEXTAREA', `type`='FORM', form_id='approve_ramark_project', form_name='approve_ramark_project', title='审批意见', input_type='STRING', required=0, readable=0, writable=1, visable=1, `scale`=NULL, `length`=500, binding=NULL, data_grid=NULL, tips=NULL, format=NULL, span=12, sub_title=NULL, `options`=NULL, flow_type='CLOUD_MARK_SOP_FLOW', form_setup=3, handle=0, form_group=2, role_type='PROJECT_MANAGER', create_id=1, create_time=1
-WHERE id=140;
+WHERE id=140;
+
+UPDATE t_d_form_widget
+SET code='NUMBER', `type`='FORM', form_id='scan_page_count', form_name='scan_page_count', title='扫描张数', input_type='INT', required=1, readable=0, writable=1, visable=1, `scale`=NULL, `length`=NULL, binding=NULL, data_grid=NULL, tips=NULL, format=NULL, span=3, sub_title=NULL, `options`=NULL, flow_type='CLOUD_MARK_SOP_FLOW', form_setup=9, handle=0, form_group=NULL, role_type=NULL, create_id=1, create_time=8
+WHERE id=195;
+UPDATE t_d_form_widget
+SET code='LABEL', `type`='FORM', form_id='scan_page_count_label', form_name='scan_page_count_label', title='[{"label":"操作说明","color":"black"},{"label":"1、待补充","color":"black"},{"label":"2、待补充","color":"black"},{"label":"3、待补充","color":"black"}]', input_type='STRING', required=0, readable=1, writable=0, visable=1, `scale`=NULL, `length`=NULL, binding=NULL, data_grid=NULL, tips=NULL, format=NULL, span=6, sub_title=NULL, `options`=NULL, flow_type='CLOUD_MARK_SOP_FLOW', form_setup=9, handle=0, form_group=NULL, role_type=NULL, create_id=1, create_time=9
+WHERE id=196;