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

icssman-service/src/main/java/com/diagbot/facade/ScaleContentFacade.java

@@ -16,6 +16,7 @@ import com.diagbot.service.ScaleContentService;
 import com.diagbot.service.impl.ScaleContentServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
+import com.diagbot.util.UserUtils;
 import com.diagbot.vo.QuestionPageVO;
 import com.diagbot.vo.ScaleContentSaveVO;
 import com.diagbot.vo.ScaleContentVO;
@@ -51,7 +52,7 @@ public class ScaleContentFacade extends ScaleContentServiceImpl {
     public void insertOrUpdate(ScaleContentSaveVO scaleContentSaveVO) {
         Long scaleId = scaleContentSaveVO.getScaleId();
         Date now = DateUtil.now();
-        String userId = "ddd";
+        String userId = UserUtils.getCurrentPrincipleID();
         //删除原关联内容
         if (scaleId != null) {
             this.update(new ScaleContent(), new UpdateWrapper<ScaleContent>()